2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00

Adds setting to close forms using escape key

- Configurable per user
- Default = false (to preserve behavior)
This commit is contained in:
Oliver 2021-10-11 11:16:33 +11:00
parent 8d33ee6298
commit a32b5fdd64
3 changed files with 10 additions and 2 deletions

View File

@ -981,6 +981,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
'default': True, 'default': True,
'validator': bool, '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: class Meta:

View File

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

View File

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