{% if part.active %}
diff --git a/InvenTree/part/test_part.py b/InvenTree/part/test_part.py
index 1301df3c91..677b159762 100644
--- a/InvenTree/part/test_part.py
+++ b/InvenTree/part/test_part.py
@@ -4,6 +4,8 @@
from __future__ import unicode_literals
+from django.contrib.auth import get_user_model
+
from django.test import TestCase
from django.core.exceptions import ValidationError
@@ -13,6 +15,10 @@ from .models import Part, PartTestTemplate
from .models import rename_part_image, match_part_names
from .templatetags import inventree_extras
+import part.settings
+
+from common.models import InvenTreeSetting
+
class TemplateTagTest(TestCase):
""" Tests for the custom template tag code """
@@ -164,3 +170,107 @@ class TestTemplateTest(TestCase):
PartTestTemplate.objects.create(part=variant, test_name='A Sample Test')
self.assertEqual(variant.getTestTemplates().count(), n + 1)
+
+
+class PartSettingsTest(TestCase):
+ """
+ Tests to ensure that the user-configurable default values work as expected.
+
+ Some fields for the Part model can have default values specified by the user.
+ """
+
+ def setUp(self):
+ # Create a user for auth
+ User = get_user_model()
+
+ self.user = User.objects.create_user(
+ username='testuser',
+ email='test@testing.com',
+ password='password',
+ is_staff=True
+ )
+
+ def make_part(self):
+ """
+ Helper function to create a simple part
+ """
+
+ part = Part.objects.create(
+ name='Test Part',
+ description='I am but a humble test part',
+ IPN='IPN-123',
+ )
+
+ return part
+
+ def test_defaults(self):
+ """
+ Test that the default values for the part settings are correct
+ """
+
+ self.assertTrue(part.settings.part_component_default())
+ self.assertFalse(part.settings.part_purchaseable_default())
+ self.assertFalse(part.settings.part_salable_default())
+ self.assertFalse(part.settings.part_trackable_default())
+
+ def test_initial(self):
+ """
+ Test the 'initial' default values (no default values have been set)
+ """
+
+ part = self.make_part()
+
+ self.assertTrue(part.component)
+ self.assertFalse(part.purchaseable)
+ self.assertFalse(part.salable)
+ self.assertFalse(part.trackable)
+
+ def test_custom(self):
+ """
+ Update some of the part values and re-test
+ """
+
+ for val in [True, False]:
+ InvenTreeSetting.set_setting('PART_COMPONENT', val, self.user)
+ InvenTreeSetting.set_setting('PART_PURCHASEABLE', val, self.user)
+ InvenTreeSetting.set_setting('PART_SALABLE', val, self.user)
+ InvenTreeSetting.set_setting('PART_TRACKABLE', val, self.user)
+
+ self.assertEqual(val, InvenTreeSetting.get_setting('PART_COMPONENT'))
+ self.assertEqual(val, InvenTreeSetting.get_setting('PART_PURCHASEABLE'))
+ self.assertEqual(val, InvenTreeSetting.get_setting('PART_SALABLE'))
+ self.assertEqual(val, InvenTreeSetting.get_setting('PART_TRACKABLE'))
+
+ part = self.make_part()
+
+ self.assertEqual(part.component, val)
+ self.assertEqual(part.purchaseable, val)
+ self.assertEqual(part.salable, val)
+ self.assertEqual(part.trackable, val)
+
+ Part.objects.filter(pk=part.pk).delete()
+
+ def test_duplicate_ipn(self):
+ """
+ Test the setting which controls duplicate IPN values
+ """
+
+ # Create a part
+ Part.objects.create(name='Hello', description='A thing', IPN='IPN123')
+
+ # Attempt to create a duplicate item (should fail)
+ with self.assertRaises(ValidationError):
+ Part.objects.create(name='Hello', description='A thing', IPN='IPN123')
+
+ # Attempt to create item with duplicate IPN (should be allowed by default)
+ Part.objects.create(name='Hello', description='A thing', IPN='IPN123', revision='B')
+
+ # And attempt again with the same values (should fail)
+ with self.assertRaises(ValidationError):
+ Part.objects.create(name='Hello', description='A thing', IPN='IPN123', revision='B')
+
+ # Now update the settings so duplicate IPN values are *not* allowed
+ InvenTreeSetting.set_setting('PART_ALLOW_DUPLICATE_IPN', False, self.user)
+
+ with self.assertRaises(ValidationError):
+ Part.objects.create(name='Hello', description='A thing', IPN='IPN123', revision='C')
diff --git a/InvenTree/part/test_views.py b/InvenTree/part/test_views.py
index 1ad5c33e45..2a36dd9012 100644
--- a/InvenTree/part/test_views.py
+++ b/InvenTree/part/test_views.py
@@ -5,7 +5,7 @@ from django.urls import reverse
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group
-from .models import Part
+from .models import Part, PartRelated
class PartViewTestCase(TestCase):
@@ -204,24 +204,31 @@ class PartTests(PartViewTestCase):
class PartRelatedTests(PartViewTestCase):
def test_valid_create(self):
- """ test creation of an attachment for a valid part """
+ """ test creation of a related part """
- response = self.client.get(reverse('part-related-create'), {'part': 1}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+ # Test GET view
+ response = self.client.get(reverse('part-related-create'), {'part': 1},
+ HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertEqual(response.status_code, 200)
- # TODO - Create a new attachment using this view
+ # Test POST view with valid form data
+ response = self.client.post(reverse('part-related-create'), {'part_1': 1, 'part_2': 2},
+ HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+ self.assertContains(response, '"form_valid": true', status_code=200)
- def test_invalid_create(self):
- """ test creation of an attachment for an invalid part """
+ # Try to create the same relationship with part_1 and part_2 pks reversed
+ response = self.client.post(reverse('part-related-create'), {'part_1': 2, 'part_2': 1},
+ HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+ self.assertContains(response, '"form_valid": false', status_code=200)
- # TODO
- pass
-
- def test_edit(self):
- """ test editing an attachment """
-
- # TODO
- pass
+ # Try to create part related to itself
+ response = self.client.post(reverse('part-related-create'), {'part_1': 1, 'part_2': 1},
+ HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+ self.assertContains(response, '"form_valid": false', status_code=200)
+
+ # Check final count
+ n = PartRelated.objects.all().count()
+ self.assertEqual(n, 1)
class PartAttachmentTests(PartViewTestCase):
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index b522a66159..ff412bb50c 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -130,17 +130,6 @@ class PartRelatedCreate(AjaxCreateView):
return form
- def post_save(self):
- """ Save PartRelated model (POST method does not) """
-
- form = self.get_form()
-
- if form.is_valid():
- part_1 = form.cleaned_data['part_1']
- part_2 = form.cleaned_data['part_2']
-
- PartRelated.create(part_1, part_2)
-
class PartRelatedDelete(AjaxDeleteView):
""" View for deleting a PartRelated object """
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index 2ec42dd2f3..4899ddee8d 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -1247,12 +1247,21 @@ class StockItem(MPTTModel):
@property
def required_test_count(self):
+ """
+ Return the number of 'required tests' for this StockItem
+ """
return self.part.getRequiredTests().count()
def hasRequiredTests(self):
+ """
+ Return True if there are any 'required tests' associated with this StockItem
+ """
return self.part.getRequiredTests().count() > 0
def passedAllRequiredTests(self):
+ """
+ Returns True if this StockItem has passed all required tests
+ """
status = self.requiredTestStatus()
diff --git a/InvenTree/templates/InvenTree/settings/part.html b/InvenTree/templates/InvenTree/settings/part.html
index 495526c94a..d1ad6e98e9 100644
--- a/InvenTree/templates/InvenTree/settings/part.html
+++ b/InvenTree/templates/InvenTree/settings/part.html
@@ -11,10 +11,19 @@
{% block settings %}
+{% trans "Part Options" %}
+
{% include "InvenTree/settings/setting.html" with key="PART_IPN_REGEX" %}
+ {% include "InvenTree/settings/setting.html" with key="PART_ALLOW_DUPLICATE_IPN" %}
+ |
+ {% include "InvenTree/settings/setting.html" with key="PART_COMPONENT" %}
+ {% include "InvenTree/settings/setting.html" with key="PART_PURCHASEABLE" %}
+ {% include "InvenTree/settings/setting.html" with key="PART_SALABLE" %}
+ {% include "InvenTree/settings/setting.html" with key="PART_TRACKABLE" %}
+ |
{% include "InvenTree/settings/setting.html" with key="PART_COPY_BOM" %}
{% include "InvenTree/settings/setting.html" with key="PART_COPY_PARAMETERS" %}
{% include "InvenTree/settings/setting.html" with key="PART_COPY_TESTS" %}
diff --git a/InvenTree/users/models.py b/InvenTree/users/models.py
index b07ae16c31..46a6d59c5b 100644
--- a/InvenTree/users/models.py
+++ b/InvenTree/users/models.py
@@ -110,6 +110,9 @@ class RuleSet(models.Model):
'report_reportasset',
'report_testreport',
'part_partstar',
+
+ # Third-party tables
+ 'error_report_error',
]
RULE_OPTIONS = [
@@ -317,7 +320,8 @@ def update_group_roles(group, debug=False):
permission = get_permission_object(perm)
- group.permissions.add(permission)
+ if permission:
+ group.permissions.add(permission)
if debug:
print(f"Adding permission {perm} to group {group.name}")
@@ -331,7 +335,8 @@ def update_group_roles(group, debug=False):
permission = get_permission_object(perm)
- group.permissions.remove(permission)
+ if permission:
+ group.permissions.remove(permission)
if debug:
print(f"Removing permission {perm} from group {group.name}")
diff --git a/requirements.txt b/requirements.txt
index 5d2917b57d..01a46bba71 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,5 +26,6 @@ django-tex==1.1.7 # LaTeX PDF export
django-weasyprint==1.0.1 # HTML PDF export
django-debug-toolbar==2.2 # Debug / profiling toolbar
django-admin-shell==0.1.2 # Python shell for the admin interface
+django-error-report==0.2.0 # Error report viewer for the admin interface
inventree # Install the latest version of the InvenTree API python library
\ No newline at end of file
|