Merge remote-tracking branch 'inventree/master'

InvenTree/InvenTree/static/css/inventree.css

@@ -839,6 +839,11 @@ input[type="submit"] {
     padding: 10px;
 }
 
+.card-thumb {
+    max-width: 64px;
+    max-height: 64px;
+}
+
 .float-right {
     float: right;
 }

InvenTree/build/serializers.py

@@ -490,6 +490,21 @@ class OverallocationChoice():
 class BuildCompleteSerializer(serializers.Serializer):
     """DRF serializer for marking a BuildOrder as complete."""
 
+    def get_context_data(self):
+        """Retrieve extra context data for this serializer.
+
+        This is so we can determine (at run time) whether the build is ready to be completed.
+        """
+
+        build = self.context['build']
+
+        return {
+            'overallocated': build.has_overallocated_parts(),
+            'allocated': build.are_untracked_parts_allocated(),
+            'remaining': build.remaining,
+            'incomplete': build.incomplete_count,
+        }
+
     accept_overallocated = serializers.ChoiceField(
         label=_('Overallocated Stock'),
         choices=list(OverallocationChoice.OPTIONS.items()),

InvenTree/build/templates/build/build_base.html

@@ -228,11 +228,7 @@ src="{% static 'img/blank_image.png' %}"
     });
 
     $("#build-complete").on('click', function() {
-        completeBuildOrder({{ build.pk }}, {
+        completeBuildOrder({{ build.pk }});
-            overallocated: {% if build.has_overallocated_parts %}true{% else %}false{% endif %},
-            allocated: {% if build.are_untracked_parts_allocated %}true{% else %}false{% endif %},
-            completed: {% if build.remaining == 0 %}true{% else %}false{% endif %},
-        });
     });
     {% endif %}
 

InvenTree/part/api.py

@@ -1605,6 +1605,20 @@ class PartParameterList(ListCreateAPI):
     queryset = PartParameter.objects.all()
     serializer_class = part_serializers.PartParameterSerializer
 
+    def get_serializer(self, *args, **kwargs):
+        """Return the serializer instance for this API endpoint.
+
+        If requested, extra detail fields are annotated to the queryset:
+        - template_detail
+        """
+
+        try:
+            kwargs['template_detail'] = str2bool(self.request.GET.get('template_detail', True))
+        except AttributeError:
+            pass
+
+        return self.serializer_class(*args, **kwargs)
+
     filter_backends = [
         DjangoFilterBackend
     ]

InvenTree/part/serializers.py

@@ -247,6 +247,19 @@ class PartParameterTemplateSerializer(InvenTreeModelSerializer):
 class PartParameterSerializer(InvenTreeModelSerializer):
     """JSON serializers for the PartParameter model."""
 
+    def __init__(self, *args, **kwargs):
+        """Custom initialization method for the serializer.
+
+        Allows us to optionally include or exclude particular information
+        """
+
+        template_detail = kwargs.pop('template_detail', False)
+
+        super().__init__(*args, **kwargs)
+
+        if not template_detail:
+            self.fields.pop('template_detail')
+
     template_detail = PartParameterTemplateSerializer(source='template', many=False, read_only=True)
 
     class Meta:

InvenTree/part/templates/part/detail.html

@@ -813,7 +813,6 @@
     onPanelLoad("part-parameters", function() {
         loadPartParameterTable(
             '#parameter-table',
-            '{% url "api-part-parameter-list" %}',
             {
                 params: {
                     part: {{ part.pk }},

InvenTree/templates/js/translated/build.js

@@ -201,58 +201,74 @@ function cancelBuildOrder(build_id, options={}) {
 /* Construct a form to "complete" (finish) a build order */
 function completeBuildOrder(build_id, options={}) {
 
-    var url = `/api/build/${build_id}/finish/`;
+    constructForm(`/api/build/${build_id}/finish/`, {
+        fieldsFunction: function(opts) {
+            var ctx = opts.context || {};
 
-    var fields = {
+            var fields = {
-        accept_unallocated: {},
+                accept_unallocated: {},
-        accept_overallocated: {},
+                accept_overallocated: {},
-        accept_incomplete: {},
+                accept_incomplete: {},
-    };
+            };
 
-    var html = '';
+            // Hide "accept overallocated" field if the build is *not* overallocated
+            if (!ctx.overallocated) {
+                delete fields.accept_overallocated;
+            }
 
-    if (options.allocated && options.completed) {
+            // Hide "accept incomplete" field if the build has been completed
-        html += `
+            if (!ctx.remaining || ctx.remaining == 0) {
-        <div class='alert alert-block alert-success'>
+                delete fields.accept_incomplete;
-        {% trans "Build order is ready to be completed" %}
+            }
-        </div>`;
-    } else {
-        html += `
-        <div class='alert alert-block alert-danger'>
-        <strong>{% trans "Build Order is incomplete" %}</strong>
-        </div>
-        `;
 
-        if (!options.allocated) {
+            // Hide "accept unallocated" field if the build is fully allocated
-            html += `<div class='alert alert-block alert-warning'>{% trans "Required stock has not been fully allocated" %}</div>`;
+            if (ctx.allocated) {
-        }
+                delete fields.accept_unallocated;
+            }
 
-        if (!options.completed) {
+            return fields;
-            html += `<div class='alert alert-block alert-warning'>{% trans "Required build quantity has not been completed" %}</div>`;
+        },
-        }
+        preFormContent: function(opts) {
-    }
+            var ctx = opts.context || {};
 
-    // Hide particular fields if they are not required
+            var html = '';
 
-    if (options.allocated) {
+            if (ctx.allocated && ctx.remaining == 0 && ctx.incomplete == 0) {
-        delete fields.accept_unallocated;
+                html += `
-    }
+                <div class='alert alert-block alert-success'>
+                {% trans "Build order is ready to be completed" %}'
+                </div>`;
+            } else {
 
-    if (options.completed) {
+                if (ctx.incomplete > 0) {
-        delete fields.accept_incomplete;
+                    html += `
-    }
+                    <div class='alert alert-block alert-danger'>
+                    <strong>{% trans "Build order has incomplete outputs" %}</strong><br>
+                    {% trans "This build order cannot be completed as there are incomplete outputs" %}
+                    </div>`;
+                } else {
+                    html += `
+                    <div class='alert alert-block alert-danger'>
+                    <strong>{% trans "Build Order is incomplete" %}</strong>
+                    </div>
+                    `;
+                }
 
-    if (!options.overallocated) {
+                if (!ctx.allocated) {
-        delete fields.accept_overallocated;
+                    html += `<div class='alert alert-block alert-warning'>{% trans "Required stock has not been fully allocated" %}</div>`;
-    }
+                }
 
-    constructForm(url, {
+                if (ctx.remaining > 0) {
-        fields: fields,
+                    html += `<div class='alert alert-block alert-warning'>{% trans "Required build quantity has not been completed" %}</div>`;
+                }
+            }
+
+            return html;
+        },
         reload: true,
         confirm: true,
-        method: 'POST',
         title: '{% trans "Complete Build Order" %}',
-        preFormContent: html,
+        method: 'POST',
     });
 }
 

InvenTree/templates/js/translated/forms.js

@@ -1727,7 +1727,8 @@ function initializeRelatedField(field, fields, options={}) {
                 var query = field.filters || {};
 
                 // Add search and pagination options
-                query.search = params.term;
+                query.search = sanitizeInputString(params.term);
+
                 query.offset = offset;
                 query.limit = pageSize;
 

InvenTree/templates/js/translated/helpers.js

@@ -258,7 +258,7 @@ function renderLink(text, url, options={}) {
         return text;
     }
 
-    var max_length = options.max_length || 100;
+    var max_length = options.max_length || 0;
 
     if (max_length > 0) {
         text = shortenString(text, {
@@ -379,6 +379,10 @@ function setupNotesField(element, url, options={}) {
  */
 function sanitizeInputString(s, options={}) {
 
+    if (!s) {
+        return s;
+    }
+
     // Remove ASCII control characters
     s = s.replace(/[\x01-\x1F]+/g, '');
 

InvenTree/templates/js/translated/part.js

@@ -803,7 +803,7 @@ function loadSimplePartTable(table, url, options={}) {
 }
 
 
-function loadPartParameterTable(table, url, options) {
+function loadPartParameterTable(table, options) {
 
     var params = options.params || {};
 
@@ -819,7 +819,7 @@ function loadPartParameterTable(table, url, options) {
     setupFilterList('part-parameters', $(table), filterTarget);
 
     $(table).inventreeTable({
-        url: url,
+        url: '{% url "api-part-parameter-list" %}',
         original: params,
         queryParams: filters,
         name: 'partparameters',
@@ -1292,13 +1292,12 @@ function loadParametricPartTable(table, options={}) {
         },
         columns: columns,
         showColumns: true,
-        // filterControl: true,
         sidePagination: 'server',
         idField: 'pk',
         uniqueId: 'pk',
-        onLoadSuccess: function() {
+        onLoadSuccess: function(response) {
 
-            var data = $(table).bootstrapTable('getData');
+            var data = response.results;
 
             for (var idx = 0; idx < data.length; idx++) {
                 var row = data[idx];
@@ -1309,7 +1308,7 @@ function loadParametricPartTable(table, options={}) {
                     row[`parameter_${parameter.template}`] = parameter.data;
                 });
 
-                $(table).bootstrapTable('updateRow', pk, row);
+                $(table).bootstrapTable('updateByUniqueId', pk, row);
             }
         }
     });
@@ -1356,7 +1355,7 @@ function partGridTile(part) {
             <div class='panel-content'>
                 <div class='row'>
                     <div class='col-sm-4'>
-                        <img src='${part.thumbnail}' style='width: 100%;' class='card-thumb' onclick='showModalImage("${part.image}")'>
+                        <img src='${part.thumbnail}' class='card-thumb' onclick='showModalImage("${part.image}")'>
                     </div>
                     <div class='col-sm-8'>
                         <table class='table table-striped table-condensed'>