inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-15 11:33:08 +00:00
Code

Tweak how "submit" button gets hidden (#4025)

Browse Source
This commit is contained in:
Oliver 2022-12-07 23:34:33 +11:00 committed by GitHub
parent d238596bfb
commit cd29ddaf12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
InvenTree/templates/js/translated/modals.js
View File

@ -45,6 +45,18 @@ function createNewModal(options={}) {
var submitClass = options.submitClass || 'primary'; var submitClass = options.submitClass || 'primary';
var buttons = '';
// Add in a "close" button
if (!options.hideCloseButton) {
buttons += `<button type='button' class='btn btn-secondary' id='modal-form-close' data-bs-dismiss='modal'>{% trans "Cancel" %}</button>`;
}
// Add in a "submit" button
if (!options.hideSubmitButton) {
buttons += `<button type='button' class='btn btn-${submitClass}' id='modal-form-submit'>{% trans "Submit" %}</button>`;
}
var html = ` var html = `
<div class='modal fade modal-fixed-footer modal-primary inventree-modal' role='dialog' id='modal-form-${id}' tabindex='-1'> <div class='modal fade modal-fixed-footer modal-primary inventree-modal' role='dialog' id='modal-form-${id}' tabindex='-1'>
<div class='modal-dialog'> <div class='modal-dialog'>
@ -79,8 +91,7 @@ function createNewModal(options={}) {
<div id='modal-footer-secondary-buttons'> <div id='modal-footer-secondary-buttons'>
<!-- Extra secondary buttons can be inserted here --> <!-- Extra secondary buttons can be inserted here -->
</div> </div>
<button type='button' class='btn btn-secondary' id='modal-form-close' data-bs-dismiss='modal'>{% trans "Cancel" %}</button> ${buttons}
<button type='button' class='btn btn-${submitClass}' id='modal-form-submit'>{% trans "Submit" %}</button>
</div> </div>
</div> </div>
</div> </div>
@ -102,11 +113,7 @@ function createNewModal(options={}) {
// Steal keyboard focus // Steal keyboard focus
$(modal_name).focus(); $(modal_name).focus();
if (options.hideCloseButton) { if (options.preventSubmit) {
$(modal_name).find('#modal-form-close').hide();
}
if (options.preventSubmit || options.hideSubmitButton) {
$(modal_name).find('#modal-form-submit').hide(); $(modal_name).find('#modal-form-submit').hide();
} }

2
InvenTree/templates/js/translated/order.js
View File

@ -1213,7 +1213,7 @@ function orderParts(parts_list, options={}) {
constructFormBody({}, { constructFormBody({}, {
preFormContent: html, preFormContent: html,
title: '{% trans "Order Parts" %}', title: '{% trans "Order Parts" %}',
preventSubmit: true, hideSubmitButton: true,
closeText: '{% trans "Close" %}', closeText: '{% trans "Close" %}',
afterRender: function(fields, opts) { afterRender: function(fields, opts) {
parts.forEach(function(part) { parts.forEach(function(part) {