From 5329e3e56ca234fc321ff675fef6424ab0f4b841 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 12 Jul 2021 19:42:06 +1000 Subject: [PATCH] Display per-line errors --- InvenTree/templates/js/forms.js | 30 ++++++++++++------------------ InvenTree/templates/js/stock.js | 11 +++++++---- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/InvenTree/templates/js/forms.js b/InvenTree/templates/js/forms.js index 103ba26572..a9747d8f7d 100644 --- a/InvenTree/templates/js/forms.js +++ b/InvenTree/templates/js/forms.js @@ -816,33 +816,27 @@ function handleFormErrors(errors, fields, options) { } for (field_name in errors) { - if (field_name in fields) { - // Add the 'has-error' class - $(options.modal).find(`#div_id_${field_name}`).addClass('has-error'); + // Add the 'has-error' class + $(options.modal).find(`#div_id_${field_name}`).addClass('has-error'); - var field_dom = $(options.modal).find(`#errors-${field_name}`); // $(options.modal).find(`#id_${field_name}`); + var field_dom = $(options.modal).find(`#errors-${field_name}`); // $(options.modal).find(`#id_${field_name}`); - var field_errors = errors[field_name]; + var field_errors = errors[field_name]; - // Add an entry for each returned error message - for (var idx = field_errors.length-1; idx >= 0; idx--) { + // Add an entry for each returned error message + for (var idx = field_errors.length-1; idx >= 0; idx--) { - var error_text = field_errors[idx]; + var error_text = field_errors[idx]; - var html = ` - - ${error_text} - `; + var html = ` + + ${error_text} + `; - field_dom.append(html); - } - - } else { - console.log(`WARNING: handleFormErrors found no match for field '${field_name}'`); + field_dom.append(html); } } - } diff --git a/InvenTree/templates/js/stock.js b/InvenTree/templates/js/stock.js index c06ebf3fd0..35f7b6bb69 100644 --- a/InvenTree/templates/js/stock.js +++ b/InvenTree/templates/js/stock.js @@ -167,7 +167,12 @@ function adjustStock(items, options={}) { ${item.part_detail.full_name} ${quantity}${status} ${location} - ${actionInput} + +
+ ${actionInput} +
+
+ ${buttons} `; @@ -259,9 +264,7 @@ function adjustStock(items, options={}) { error: function(xhr) { switch (xhr.status) { case 400: - console.log('400 bad request'); - console.log(xhr.responseJSON); - + // Handle errors for standard fields handleFormErrors( xhr.responseJSON,