inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 04:55:44 +00:00
Code Activity

out-of-scope:update settings value lookup to include typ (#3636)

Browse Source
This commit is contained in:
Matthias Mair
2022-09-02 08:51:16 +02:00
committed by GitHub
parent 23edd79431
commit eaaf98f9d4
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/templates/InvenTree/settings/setting.html
View File

@ -24,11 +24,11 @@
<td>
{% if setting.is_bool %}
<div class='form-check form-switch'>
<input class='form-check-input boolean-setting' fieldname='{{ setting.key.upper }}' pk='{{ setting.pk }}' setting='{{ setting.key.upper }}' id='setting-value-{{ setting.key.upper }}' type='checkbox' {% if setting.as_bool %}checked=''{% endif %} {% if plugin %}plugin='{{ plugin.slug }}'{% endif %}{% if user_setting %}user='{{request.user.id}}'{% endif %}{% if notification_setting %}notification='{{request.user.id}}'{% endif %}>
<input class='form-check-input boolean-setting' fieldname='{{ setting.key.upper }}' pk='{{ setting.pk }}' setting='{{ setting.key.upper }}' id='setting-value-{{ setting.pk }}-{{ setting.typ }}' type='checkbox' {% if setting.as_bool %}checked=''{% endif %}{{reference}}>
</div>
{% else %}
<div id='setting-{{ setting.pk }}'>
<span id='setting-value-{{ setting.key.upper }}' fieldname='{{ setting.key.upper }}'>
<span id='setting-value-{{ setting.pk }}-{{ setting.typ }}' fieldname='{{ setting.key.upper }}'>
{% if setting.value %}
{% if setting.is_choice %}
<strong>{{ setting.as_choice }}</strong>

7
InvenTree/templates/js/dynamic/settings.js
View File

@ -118,15 +118,16 @@ function editSetting(key, options={}) {
},
onSuccess: function(response) {
var setting = response.key;
var setting_pk = response.pk;
var setting_typ = response.typ;
if (reload_required) {
location.reload();
} else if (response.type == 'boolean') {
var enabled = response.value.toString().toLowerCase() == 'true';
$(`#setting-value-${setting}`).prop('checked', enabled);
$(`#setting-value-${setting_pk}-${setting_typ}`).prop('checked', enabled);
} else {
$(`#setting-value-${setting}`).html(response.value);
$(`#setting-value-${setting_pk}-${setting_typ}`).html(response.value);
}
}
});