From 3b838d29ec68cc6d8bbe36a5f82b0bfdd9e14c58 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 29 Apr 2019 18:35:16 +1000
Subject: [PATCH 1/2] Small fixes
- Hide some tabs that aren't functional yet
- Hide fields instead of marking them as disabled
- Default behaviour is to allow all hosts
---
InvenTree/InvenTree/settings.py | 2 +-
InvenTree/company/templates/company/tabs.html | 4 ++++
InvenTree/part/views.py | 7 ++++---
InvenTree/stock/views.py | 5 +++++
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py
index 65581eb4e6..e35400a831 100644
--- a/InvenTree/InvenTree/settings.py
+++ b/InvenTree/InvenTree/settings.py
@@ -28,7 +28,7 @@ SECRET_KEY = key_file.read().strip()
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
if DEBUG:
# will output to your console
diff --git a/InvenTree/company/templates/company/tabs.html b/InvenTree/company/templates/company/tabs.html
index 4eaab521ba..7c8c03d484 100644
--- a/InvenTree/company/templates/company/tabs.html
+++ b/InvenTree/company/templates/company/tabs.html
@@ -6,13 +6,17 @@
<li{% if tab == 'parts' %} class='active'{% endif %}>
<a href="{% url 'company-detail-parts' company.id %}">Supplier Parts <span class='badge'>{{ company.part_count }}</span></a>
</li>
+ {% if 0 %}
<li{% if tab == 'po' %} class='active'{% endif %}>
<a href="#">Purchase Orders</a>
</li>
{% endif %}
+ {% endif %}
{% if company.is_customer %}
+ {% if 0 %}
<li{% if tab == 'co' %} class='active'{% endif %}>
<a href="#">Sales Orders</a>
</li>
{% endif %}
+ {% endif %}
</ul>
\ No newline at end of file
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index af8559fb01..1d92ee651a 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -10,6 +10,7 @@ from django.shortcuts import get_object_or_404
from django.urls import reverse_lazy
from django.views.generic import DetailView, ListView
from django.forms.models import model_to_dict
+from django.forms import HiddenInput
from company.models import Company
from .models import PartCategory, Part, BomItem
@@ -98,7 +99,7 @@ class PartCreate(AjaxCreateView):
form = super(AjaxCreateView, self).get_form()
# Hide the default_supplier field (there are no matching supplier parts yet!)
- del form.fields['default_supplier']
+ form.fields['default_supplier'] = HiddenInput()
return form
@@ -457,11 +458,11 @@ class SupplierPartCreate(AjaxCreateView):
if form.initial.get('supplier', None):
# Hide the supplier field
- form.fields['supplier'].widget.attrs['disabled'] = True
+ form.fields['supplier'].widget = HiddenInput()
if form.initial.get('part', None):
# Hide the part field
- form.fields['part'].widget.attrs['disabled'] = True
+ form.fields['part'].widget = HiddenInput()
return form
diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py
index a1f0d2335c..acca7cc235 100644
--- a/InvenTree/stock/views.py
+++ b/InvenTree/stock/views.py
@@ -7,6 +7,7 @@ from __future__ import unicode_literals
from django.views.generic import DetailView, ListView
from django.forms.models import model_to_dict
+from django.forms import HiddenInput
from InvenTree.views import AjaxUpdateView, AjaxDeleteView, AjaxCreateView
@@ -141,6 +142,10 @@ class StockItemCreate(AjaxCreateView):
parts = parts.filter(part=part)
form.fields['supplier_part'].queryset = parts
+ # Hide the 'part' field
+ form.fields['part'].widget = HiddenInput()
+
+
# Otherwise if the user has selected a SupplierPart, we know what Part they meant!
elif form['supplier_part'].value() is not None:
pass
From e471313435a2ca3bb6566ed5ba47f5771bbadb17 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 29 Apr 2019 18:43:44 +1000
Subject: [PATCH 2/2] PEP fix
---
InvenTree/stock/views.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py
index acca7cc235..3038a843f1 100644
--- a/InvenTree/stock/views.py
+++ b/InvenTree/stock/views.py
@@ -145,7 +145,6 @@ class StockItemCreate(AjaxCreateView):
# Hide the 'part' field
form.fields['part'].widget = HiddenInput()
-
# Otherwise if the user has selected a SupplierPart, we know what Part they meant!
elif form['supplier_part'].value() is not None:
pass