From 141b764b9496caf24cb913cbc8c21ea5ef787c43 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 3 May 2022 14:00:43 +1000
Subject: [PATCH] Modal fixes

---
 InvenTree/order/serializers.py              |  2 +-
 InvenTree/templates/js/translated/bom.js    |  4 +--
 InvenTree/templates/js/translated/modals.js | 37 ++++++++++++---------
 InvenTree/templates/js/translated/order.js  |  3 +-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py
index 660a278cf5..7d26ce741d 100644
--- a/InvenTree/order/serializers.py
+++ b/InvenTree/order/serializers.py
@@ -246,7 +246,7 @@ class PurchaseOrderLineItemSerializer(InvenTreeModelSerializer):
     total_price = serializers.FloatField(read_only=True)
 
     part_detail = PartBriefSerializer(source='get_base_part', many=False, read_only=True)
-    
+
     supplier_part_detail = SupplierPartSerializer(source='part', many=False, read_only=True)
 
     purchase_price = InvenTreeMoneySerializer(
diff --git a/InvenTree/templates/js/translated/bom.js b/InvenTree/templates/js/translated/bom.js
index 7308583ae3..9bd66877da 100644
--- a/InvenTree/templates/js/translated/bom.js
+++ b/InvenTree/templates/js/translated/bom.js
@@ -129,7 +129,7 @@ function constructBomUploadTable(data, options={}) {
 
             var modal = createNewModal({
                 title: '{% trans "Row Data" %}',
-                cancelText: '{% trans "Close" %}',
+                closeText: '{% trans "Close" %}',
                 hideSubmitButton: true
             });
 
@@ -617,7 +617,7 @@ function bomSubstitutesDialog(bom_item_id, substitutes, options={}) {
             },
         },
         preFormContent: html,
-        cancelText: '{% trans "Close" %}',
+        closeText: '{% trans "Close" %}',
         submitText: '{% trans "Add Substitute" %}',
         title: '{% trans "Edit BOM Item Substitutes" %}',
         afterRender: function(fields, opts) {
diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js
index b72643a0d7..85f503682e 100644
--- a/InvenTree/templates/js/translated/modals.js
+++ b/InvenTree/templates/js/translated/modals.js
@@ -85,12 +85,25 @@ function createNewModal(options={}) {
 
     var modal_name = `#modal-form-${id}`;
 
+    // Callback *after* the modal has been rendered
     $(modal_name).on('shown.bs.modal', function() {
         $(modal_name + ' .modal-form-content').scrollTop(0);
 
         if (options.focus) {
             getFieldByName(modal_name, options.focus).focus();
         }
+    
+        // Steal keyboard focus
+        $(modal_name).focus();
+
+        if (options.hideCloseButton) {
+            $(modal_name).find('#modal-form-cancel').hide();
+        }
+
+        if (options.preventSubmit || options.hideSubmitButton) {
+            $(modal_name).find('#modal-form-submit').hide();
+        }
+
     });
 
     // Automatically remove the modal when it is deleted!
@@ -102,8 +115,11 @@ function createNewModal(options={}) {
     $(modal_name).on('keydown', 'input', function(event) {
         if (event.keyCode == 13) {
             event.preventDefault();
-            // Simulate a click on the 'Submit' button
-            $(modal_name).find('#modal-form-submit').click();
+
+            if (!options.preventSubmit) {
+                // Simulate a click on the 'Submit' button
+                $(modal_name).find('#modal-form-submit').click();
+            }
             
             return false;
         }
@@ -117,18 +133,7 @@ function createNewModal(options={}) {
     // Set labels based on supplied options
     modalSetTitle(modal_name, options.title || '{% trans "Form Title" %}');
     modalSetSubmitText(modal_name, options.submitText || '{% trans "Submit" %}');
-    modalSetCloseText(modal_name, options.cancelText || '{% trans "Cancel" %}');
-
-    if (options.hideSubmitButton) {
-        $(modal_name).find('#modal-form-submit').hide();
-    }
-
-    if (options.hideCloseButton) {
-        $(modal_name).find('#modal-form-cancel').hide();
-    }
-
-    // Steal keyboard focus
-    $(modal_name).focus();
+    modalSetCloseText(modal_name, options.closeText || '{% trans "Cancel" %}');
 
     // Return the "name" of the modal
     return modal_name;
@@ -581,7 +586,7 @@ function showAlertDialog(title, content, options={}) {
 
     var modal = createNewModal({
         title: title,
-        cancelText: '{% trans "Close" %}',
+        closeText: '{% trans "Close" %}',
         hideSubmitButton: true,
     });
 
@@ -607,7 +612,7 @@ function showQuestionDialog(title, content, options={}) {
     var modal = createNewModal({
         title: title,
         submitText: options.accept_text || '{% trans "Accept" %}',
-        cancelText: options.cancel_text || '{% trans "Cancel" %}',
+        closeText: options.cancel_text || '{% trans "Cancel" %}',
     });
 
     modalSetContent(modal, content);
diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js
index b17130d05b..6c0c97cdce 100644
--- a/InvenTree/templates/js/translated/order.js
+++ b/InvenTree/templates/js/translated/order.js
@@ -625,7 +625,8 @@ function orderParts(parts_list, options={}) {
     constructFormBody({}, {
         preFormContent: html,
         title: '{% trans "Order Parts" %}',
-        hideSubmitButton: true,
+        preventSubmit: true,
+        closeText: '{% trans "Close" %}',
         afterRender: function(fields, opts) {
             // TODO
             parts.forEach(function(part) {