Refactor forms for editing and deleting a PartParameter

- PartParameters now loaded using the API, not pre-rendered

InvenTree/part/api.py

@@ -1115,10 +1115,10 @@ part_api_urls = [
 
     # Base URL for PartParameter API endpoints
     url(r'^parameter/', include([
-        url(r'^template/$', PartParameterTemplateList.as_view(), name='api-part-param-template-list'),
+        url(r'^template/$', PartParameterTemplateList.as_view(), name='api-part-parameter-template-list'),
 
-        url(r'^(?P<pk>\d+)/', PartParameterDetail.as_view(), name='api-part-param-detail'),
-        url(r'^.*$', PartParameterList.as_view(), name='api-part-param-list'),
+        url(r'^(?P<pk>\d+)/', PartParameterDetail.as_view(), name='api-part-parameter-detail'),
+        url(r'^.*$', PartParameterList.as_view(), name='api-part-parameter-list'),
     ])),
 
     url(r'^thumbs/', include([

InvenTree/part/models.py

@@ -2164,7 +2164,7 @@ class PartParameterTemplate(models.Model):
 
     @staticmethod
     def get_api_url():
-        return reverse('api-part-param-template-list')
+        return reverse('api-part-parameter-template-list')
 
     def __str__(self):
         s = str(self.name)
@@ -2205,7 +2205,7 @@ class PartParameter(models.Model):
 
     @staticmethod
     def get_api_url():
-        return reverse('api-part-param-list')
+        return reverse('api-part-parameter-list')
 
     def __str__(self):
         # String representation of a PartParameter (used in the admin interface)

InvenTree/part/serializers.py

@@ -508,19 +508,6 @@ class BomItemSerializer(InvenTreeModelSerializer):
         ]
 
 
-class PartParameterSerializer(InvenTreeModelSerializer):
-    """ JSON serializers for the PartParameter model """
-
-    class Meta:
-        model = PartParameter
-        fields = [
-            'pk',
-            'part',
-            'template',
-            'data'
-        ]
-
-
 class PartParameterTemplateSerializer(InvenTreeModelSerializer):
     """ JSON serializer for the PartParameterTemplate model """
 
@@ -533,6 +520,22 @@ class PartParameterTemplateSerializer(InvenTreeModelSerializer):
         ]
 
 
+class PartParameterSerializer(InvenTreeModelSerializer):
+    """ JSON serializers for the PartParameter model """
+
+    template_detail = PartParameterTemplateSerializer(source='template', many=False, read_only=True)
+
+    class Meta:
+        model = PartParameter
+        fields = [
+            'pk',
+            'part',
+            'template',
+            'template_detail',
+            'data'
+        ]
+
+
 class CategoryParameterTemplateSerializer(InvenTreeModelSerializer):
     """ Serializer for PartCategoryParameterTemplate """
 

InvenTree/part/templates/part/param_delete.html

@@ -1,5 +0,0 @@
-{% extends "modal_delete_form.html" %}
-
-{% block pre_form_content %}
-Are you sure you want to remove this parameter?
-{% endblock %}

InvenTree/part/templates/part/params.html

@@ -21,41 +21,23 @@
     </div>
 </div>
 
-<table id='param-table' class='table table-condensed table-striped' data-toolbar='#button-toolbar'>
-    <thead>
-        <tr>
-            <th data-field='name' data-serachable='true'>{% trans "Name" %}</th>
-            <th data-field='value' data-searchable='true'>{% trans "Value" %}</th>
-            <th data-field='units' data-searchable='true'>{% trans "Units" %}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for param in part.get_parameters %}
-        <tr>
-            <td>{{ param.template.name }}</td>
-            <td>{{ param.data }}</td>
-            <td>
-                {{ param.template.units }}
-                <div class='btn-group' style='float: right;'>
-                    {% if roles.part.change %}
-                    <button title='{% trans "Edit" %}' class='btn btn-default btn-glyph param-edit' url="{% url 'part-param-edit' param.id %}" type='button'><span class='fas fa-edit'/></button>
-                    {% endif %}
-                    {% if roles.part.change %}
-                    <button title='{% trans "Delete" %}' class='btn btn-default btn-glyph param-delete' url="{% url 'part-param-delete' param.id %}" type='button'><span class='fas fa-trash-alt icon-red'/></button>
-                    {% endif %}
-                </div>
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
-
+<table id='parameter-table' class='table table-condensed table-striped' data-toolbar="#button-toolbar"></table>
 
 {% endblock %}
 
 {% block js_ready %}
 {{ block.super }}
 
+    loadPartParameterTable(
+        '#parameter-table', 
+        '{% url "api-part-parameter-list" %}',
+        {
+            params: {
+                part: {{ part.pk }},
+            }
+        }
+    );
+
     $('#param-table').inventreeTable({
     });
 

InvenTree/part/test_api.py

@@ -805,7 +805,7 @@ class PartParameterTest(InvenTreeAPITestCase):
         Test for listing part parameters
         """
 
-        url = reverse('api-part-param-list')
+        url = reverse('api-part-parameter-list')
 
         response = self.client.get(url, format='json')
 
@@ -838,7 +838,7 @@ class PartParameterTest(InvenTreeAPITestCase):
         Test that we can create a param via the API
         """
 
-        url = reverse('api-part-param-list')
+        url = reverse('api-part-parameter-list')
 
         response = self.client.post(
             url,
@@ -860,7 +860,7 @@ class PartParameterTest(InvenTreeAPITestCase):
         Tests for the PartParameter detail endpoint
         """
 
-        url = reverse('api-part-param-detail', kwargs={'pk': 5})
+        url = reverse('api-part-parameter-detail', kwargs={'pk': 5})
 
         response = self.client.get(url)
 

InvenTree/part/urls.py

@@ -35,8 +35,6 @@ part_parameter_urls = [
     url(r'^template/(?P<pk>\d+)/delete/', views.PartParameterTemplateDelete.as_view(), name='part-param-template-edit'),
 
     url(r'^new/', views.PartParameterCreate.as_view(), name='part-param-create'),
-    url(r'^(?P<pk>\d+)/edit/', views.PartParameterEdit.as_view(), name='part-param-edit'),
-    url(r'^(?P<pk>\d+)/delete/', views.PartParameterDelete.as_view(), name='part-param-delete'),
 ]
 
 part_detail_urls = [

InvenTree/part/views.py

@@ -2307,28 +2307,6 @@ class PartParameterCreate(AjaxCreateView):
         return form
 
 
-class PartParameterEdit(AjaxUpdateView):
-    """ View for editing a PartParameter """
-
-    model = PartParameter
-    form_class = part_forms.EditPartParameterForm
-    ajax_form_title = _('Edit Part Parameter')
-
-    def get_form(self):
-
-        form = super().get_form()
-
-        return form
-
-
-class PartParameterDelete(AjaxDeleteView):
-    """ View for deleting a PartParameter """
-
-    model = PartParameter
-    ajax_template_name = 'part/param_delete.html'
-    ajax_form_title = _('Delete Part Parameter')
-
-
 class CategoryDetail(InvenTreeRoleMixin, DetailView):
     """ Detail view for PartCategory """