Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shenanigans when settings have an empty string as value in web UI

Browse source
This commit is contained in:
Théophile Diot 2024-07-25 10:59:04 +01:00
parent f74f215bf9
commit d91bca99e3
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/templates/setting_input.html vendored
View file

@ -22,7 +22,7 @@
id="{{ inp_name_mult }}"
name="{{ inp_name_mult }}"
class="regular-input"
value="{% if global_config_value %} {{ global_config_value }} {% else %} {{ inp_default }} {% endif %}"
value="{% if global_config_value != None %} {{ global_config_value }} {% else %} {{ inp_default }} {% endif %}"
type="{{ inp_type }}"
pattern="{{ inp_regex|safe }}"
{% if is_multiple %}data-is-multiple{% endif %} />

10
src/ui/templates/setting_select.html vendored
View file

@ -24,7 +24,7 @@
{% for item in inp_items %}
<option {% if not item %}label="empty"{% endif %}
value="{{ item }}"
{% if global_config_value and global_config_value == item or not global_config_value and inp_default == item %} selected{% endif %}>
{% if global_config_value != None and global_config_value == item or global_config_value == None and inp_default == item %} selected{% endif %}>
{{ item }}
</option>
{% endfor %}
@ -42,11 +42,11 @@
type="button"
class="custom-select-btn">
{% for item in inp_items %}
{% if global_config_value and
{% if global_config_value != None and
global_config_value == item %}
<span data-setting-select-text="{{ inp_id }}"
data-value="{{ global_config_value }}">{{ global_config_value }}</span>
{% elif not global_config_value and inp_default == item %}
{% elif global_config_value == None and inp_default == item %}
<span aria-description="current value"
data-setting-select-text="{{ inp_id }}"
data-value="{{ inp_default }}">{{ inp_default }}</span>
@ -67,8 +67,8 @@
data-setting-select-dropdown="{{ inp_id }}"
class="hidden z-[20] fixed h-full flex-col mt-2 max-h-[200px] overflow-auto">
{% for item in inp_items %}
{% if global_config_value and
global_config_value == item or not global_config_value
{% if global_config_value != None and
global_config_value == item or global_config_value == None
and inp_default == item %}
<button role="option"
value="{{ item }}"