Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2132 from SchrodingersGat/esc-forms

Browse Source 
Adds setting to close forms using escape key
This commit is contained in:
Oliver 2021-10-11 11:41:56 +11:00 committed by GitHub
commit d3e5bc3141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/common/models.py
View File

@ -981,6 +981,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
'default': True,
'validator': bool,
},
'FORMS_CLOSE_USING_ESCAPE': {
'name': _('Escape Key Closes Forms'),
'description': _('Use the escape key to close modal forms'),
'default': False,
'validator': bool,
}
}
class Meta:

1
InvenTree/templates/InvenTree/settings/user_forms.html
View File

@ -14,6 +14,7 @@
<div class='row'>
<table class='table table-striped table-condensed'>
<tbody>
{% include "InvenTree/settings/setting.html" with key="FORMS_CLOSE_USING_ESCAPE" icon="fa-window-close" user_setting=True %}
{% include "InvenTree/settings/setting.html" with key="PART_SHOW_QUANTITY_IN_FORMS" icon="fa-hashtag" user_setting=True %}
</tbody>
</table>

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

@ -43,7 +43,7 @@ function createNewModal(options={}) {
});
var html = `
<div class='modal fade modal-fixed-footer modal-primary inventree-modal' role='dialog' id='modal-form-${id}'>
<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-content'>
<div class="modal-header">
@ -111,7 +111,7 @@ function createNewModal(options={}) {
$(modal_name).modal({
backdrop: 'static',
keyboard: false,
keyboard: user_settings.FORMS_CLOSE_USING_ESCAPE,
});
// Set labels based on supplied options
@ -681,7 +681,7 @@ function openModal(options) {
$(modal).modal({
backdrop: 'static',
keyboard: false,
keyboard: user_settings.FORMS_CLOSE_USING_ESCAPE,
});
// Disable the form

2
InvenTree/templates/modals.html
View File

@ -7,7 +7,7 @@
</div>
<div class='modal fade modal-fixed-footer modal-primary' role='dialog' id='modal-form'>
<div class='modal fade modal-fixed-footer modal-primary' role='dialog' id='modal-form' tabindex='-1'>
<div class='modal-dialog'>
<div class='modal-content'>
<div class="modal-header">