fix multiple removing

.pre-commit-config.yaml

@@ -16,46 +16,12 @@ repos:
         args: ["--allow-multiple-documents"]
       - id: check-case-conflict
 
-  - repo: https://github.com/psf/black
-    rev: 3702ba224ecffbcec30af640c149f231d90aebdb # frozen: 24.4.2
-    hooks:
-      - id: black
-        name: Black Python Formatter
-        language_version: python3.9
-
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: ffb6a759a979008c0e6dff86e39f4745a2d9eac4 # frozen: v3.1.0
     hooks:
       - id: prettier
         name: Prettier Code Formatter
 
-  - repo: https://github.com/JohnnyMorganz/StyLua
-    rev: 84c370104d6a8d1eef00c80a3ebd42f7033aaaad # frozen: v0.20.0
-    hooks:
-      - id: stylua-github
-        exclude: ^src/(bw/lua/middleclass.lua|common/core/antibot/captcha.lua)$
-
-  - repo: https://github.com/lunarmodules/luacheck
-    rev: cc089e3f65acdd1ef8716cc73a3eca24a6b845e4 # frozen: v1.2.0
-    hooks:
-      - id: luacheck
-        exclude: ^src/(bw/lua/middleclass.lua|common/core/antibot/captcha.lua)$
-        args: ["--std", "min", "--codes", "--ranges", "--no-cache"]
-
-  - repo: https://github.com/pycqa/flake8
-    rev: 7d37d9032d0d161634be4554273c30efd4dea0b3 # frozen: 7.0.0
-    hooks:
-      - id: flake8
-        name: Flake8 Python Linter
-        args: ["--max-line-length=160", "--ignore=E266,E402,E501,E722,W503"]
-
-  - repo: https://github.com/dosisod/refurb
-    rev: 2e31f0033b6c00bf99912fc6a8b5fd00460c9ba0 # frozen: v2.0.0
-    hooks:
-      - id: refurb
-        name: Refurb Python Refactoring Tool
-        exclude: ^tests/
-
   - repo: https://github.com/codespell-project/codespell
     rev: 193cd7d27cd571f79358af09a8fb8997e54f8fff # frozen: v2.3.0
     hooks:

docs/settings.md

@@ -691,4 +691,3 @@ Allow access based on internal and external IP/network/rDNS/ASN whitelists.
 |`WHITELIST_ASN_URLS`       |                                                                                                                                                                            |global   |no      |List of URLs, separated with spaces, containing ASN to whitelist. Also supports file:// URLs and and auth basic using http://user:pass@url scheme.                 |
 |`WHITELIST_USER_AGENT_URLS`|                                                                                                                                                                            |global   |no      |List of URLs, separated with spaces, containing good User-Agent to whitelist. Also supports file:// URLs and and auth basic using http://user:pass@url scheme.     |
 |`WHITELIST_URI_URLS`       |                                                                                                                                                                            |global   |no      |List of URLs, separated with spaces, containing bad URI to whitelist. Also supports file:// URLs and and auth basic using http://user:pass@url scheme.             |
-

src/common/core/order.json

@@ -15,7 +15,14 @@
     "letsencrypt",
     "selfsigned"
   ],
-  "set": ["sessions", "whitelist", "letsencrypt", "customcert", "selfsigned", "ui"],
+  "set": [
+    "sessions",
+    "whitelist",
+    "letsencrypt",
+    "customcert",
+    "selfsigned",
+    "ui"
+  ],
   "ssl_certificate": ["customcert", "letsencrypt", "selfsigned"],
   "access": [
     "whitelist",

src/common/core/ui/ui.lua

@@ -16,4 +16,4 @@ function ui:set()
 	return self:ret(true, "set https_configured to " .. https_configured)
 end
 
-return ui
+return ui

src/ui/templates/account.html

@@ -4,13 +4,13 @@
     {% for plugin in plugins %}
         {% if plugin.get('name')|lower == 'pro' %}
         {% if pro_setting.update({'method' : plugin.get('method', 'ui')}) %}{% endif %}
-        
+
         {% for setting, value in plugin.get('settings').items() %}
             {% if setting == "PRO_LICENSE_KEY" %}
                 {% if pro_setting.update({'value' : value.get('value', '')}) %}{% endif %}
             {% endif %}
         {% endfor %}
-        
+
         {% endif %}
     {% endfor %}
     {% set attribute_name = "account" %}

src/ui/templates/setting_checkbox.html

@@ -18,6 +18,7 @@
                name="{{ inp_name_mult }}"
                data-default-method="{% if inp_name in ['AUTOCONF_MODE', 'SWARM_MODE', 'KUBERNETES_MODE'] %}mode{% else %}{{ global_config_method }}{% endif %}"
                data-default-value="{{ global_config_value }}"
+               data-default="{{ inp_default }}"
                {% if inp_name in ['AUTOCONF_MODE', 'SWARM_MODE', 'KUBERNETES_MODE'] or global_config_method != 'ui' and global_config_method != 'default' or is_read_only %} disabled {% endif %}
                data-checked="{% if global_config_value == "yes" %}true{% else %}false{% endif %}"
                {% if global_config_value == "yes" %}checked{% endif %}

src/ui/templates/setting_input.html

@@ -15,6 +15,7 @@
         <input {% if is_readonly %}disabled{% endif %}
                {% if inp_name == "SERVER_NAME" %}required{% endif %}
                data-default-value="{{ global_config_value }}"
+               data-default="{{ inp_default }}"
                data-default-method="{{ global_config_method }}"
                data-setting-input
                {% if global_config_method != 'ui' and global_config_method != 'default' or is_read_only %}disabled{% endif %}

src/ui/templates/setting_select.html

@@ -14,6 +14,7 @@
     <!-- default hidden-->
     <select data-default-method="{{ global_config_method }}"
             data-default-value="{{ inp_default }}"
+            data-default="{{ inp_default }}"
             id="{{ inp_name_mult }}"
             name="{{ inp_name_mult }}"
             data-setting-select-default="{{ inp_id }}"
@@ -35,6 +36,7 @@
                 {% if global_config_method != 'ui' and global_config_method != 'default' or is_read_only %}disabled{% endif %}
                 data-setting-select="{{ inp_id }}"
                 data-default-value="{{ global_config_value }}"
+               data-default="{{ inp_default }}"
                 data-default-method="{{ global_config_method }}"
                 aria-controls="{{ inp_id }}-dropdown"
                 type="button"