From f791ac9f579cfb03449498238a23dff6ba2d6bfa Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 17 May 2020 13:50:06 +1000 Subject: [PATCH] Register test template in the admin interface --- InvenTree/part/admin.py | 7 +++++++ .../migrations/0041_auto_20200517_0348.py | 19 +++++++++++++++++++ InvenTree/part/models.py | 3 ++- InvenTree/part/test_part.py | 2 +- InvenTree/stock/models.py | 2 +- 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 InvenTree/part/migrations/0041_auto_20200517_0348.py diff --git a/InvenTree/part/admin.py b/InvenTree/part/admin.py index fc5727bd9d..de1b7d1fae 100644 --- a/InvenTree/part/admin.py +++ b/InvenTree/part/admin.py @@ -12,6 +12,7 @@ from .models import PartCategory, Part from .models import PartAttachment, PartStar from .models import BomItem from .models import PartParameterTemplate, PartParameter +from .models import PartTestTemplate from stock.models import StockLocation from company.models import SupplierPart @@ -126,6 +127,11 @@ class PartStarAdmin(admin.ModelAdmin): list_display = ('part', 'user') +class PartTestTemplateAdmin(admin.ModelAdmin): + + list_display = ('part', 'test_name', 'required') + + class BomItemResource(ModelResource): """ Class for managing BomItem data import/export """ @@ -202,3 +208,4 @@ admin.site.register(PartStar, PartStarAdmin) admin.site.register(BomItem, BomItemAdmin) admin.site.register(PartParameterTemplate, ParameterTemplateAdmin) admin.site.register(PartParameter, ParameterAdmin) +admin.site.register(PartTestTemplate, PartTestTemplateAdmin) diff --git a/InvenTree/part/migrations/0041_auto_20200517_0348.py b/InvenTree/part/migrations/0041_auto_20200517_0348.py new file mode 100644 index 0000000000..ff24313193 --- /dev/null +++ b/InvenTree/part/migrations/0041_auto_20200517_0348.py @@ -0,0 +1,19 @@ +# Generated by Django 3.0.5 on 2020-05-17 03:48 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('part', '0040_parttesttemplate'), + ] + + operations = [ + migrations.AlterField( + model_name='parttesttemplate', + name='part', + field=models.ForeignKey(limit_choices_to={'trackable': True}, on_delete=django.db.models.deletion.CASCADE, related_name='test_templates', to='part.Part'), + ), + ] diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 94e1efb202..76a5965aae 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -1183,7 +1183,8 @@ class PartTestTemplate(models.Model): part = models.ForeignKey( Part, on_delete=models.CASCADE, - related_name='test_templates' + related_name='test_templates', + limit_choices_to={'trackable': True}, ) test_name = models.CharField( diff --git a/InvenTree/part/test_part.py b/InvenTree/part/test_part.py index 4418c64db5..de2edcec98 100644 --- a/InvenTree/part/test_part.py +++ b/InvenTree/part/test_part.py @@ -163,4 +163,4 @@ class TestTemplateTest(TestCase): PartTestTemplate.objects.create(part=variant, test_name='A Sample Test') - self.assertEqual(variant.getTestTemplates().count(), n + 1) \ No newline at end of file + self.assertEqual(variant.getTestTemplates().count(), n + 1) diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 6b29c6e5fc..851c80a9ed 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -962,7 +962,7 @@ class StockItem(MPTTModel): result_map = {} for result in results: - key = helpers.generateTestKey(result.test) + key = helpers.generateTestKey(result.test) result_map[key] = result return result_map