From 442ed7bb8a37a1b279c659824027681170678f38 Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 28 Jul 2022 21:53:27 +0800 Subject: [PATCH] ui: setting: fix disabled flag --- packages/ui-default/package.json | 2 +- .../ui-default/templates/partials/setting.html | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 4c8689559..f4a2bd20c 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.38.22", + "version": "4.38.23", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/partials/setting.html b/packages/ui-default/templates/partials/setting.html index 141146790..a403d62c3 100644 --- a/packages/ui-default/templates/partials/setting.html +++ b/packages/ui-default/templates/partials/setting.html @@ -15,7 +15,7 @@ help_text:setting.desc, name:setting.key, value:'' if (secret or isFileConfig) else (current[setting.key]|default(setting.value)), - disabled:setting.disabled, + disabled:setting.flag|bitand(2), placeholder:'Please edit in ~/.hydro/env instead' if isFileConfig else (_('(Not changed)') if secret else '') }) }} {% elif setting.type == 'select' %} @@ -25,7 +25,7 @@ help_text:setting.desc, name:setting.key, value:current[setting.key] or setting.value, - disabled:setting.disabled + disabled:setting.flag|bitand(2) }) }} {% elif setting.type == 'radio' %} {{ form.form_radio({ @@ -34,7 +34,7 @@ help_text:setting.desc, name:setting.key, value:current[setting.key] or setting.value, - disabled:setting.disabled + disabled:setting.flag|bitand(2) }) }} {% elif setting.type == 'image_radio' %} {{ form.form_image_radio({ @@ -44,7 +44,7 @@ help_text:setting.desc, name:setting.key, value:current[setting.key] or setting.value, - disabled:setting.disabled + disabled:setting.flag|bitand(2) }) }} {% elif setting.type == 'textarea' %} {{ form.form_textarea({ @@ -52,7 +52,7 @@ help_text:setting.desc, name:setting.key, value:'' if secret else (current[setting.key]|default(setting.value)), - disabled:setting.disabled, + disabled:setting.flag|bitand(2), placeholder:_('(Not changed)') if secret else '', extra_attr: 'data-yaml' if setting.subType == 'yaml' else '' }) }} @@ -63,7 +63,7 @@ name:setting.key, value:'' if secret else (current[setting.key]|default(setting.value)), markdown:true, - disabled:setting.disabled, + disabled:setting.flag|bitand(2), placeholder:_('(Not changed)') if secret else '' }) }} {% elif setting.type == 'boolean' %} @@ -73,7 +73,7 @@ help_text:setting.desc, name:setting.key, value:setting.value if (_val === undefined or _val === null) else _val, - disabled:setting.disabled + disabled:setting.flag|bitand(2) })}} {{ form.form_checkbox({ label:setting.name,