summaryrefslogtreecommitdiffstats
path: root/deluge/ui/web/server.py
diff options
context:
space:
mode:
authorCalum Lind <calumlind@gmail.com>2018-10-16 10:04:44 +0100
committerCalum Lind <calumlind@gmail.com>2018-10-16 11:52:04 +0100
commitec4772068609b5d89d5a6bfb8f9c1ca1bb35704d (patch)
treed53512dcc6c3f3523f13b8aeb38e9e0ada6b8f13 /deluge/ui/web/server.py
parent467ade1eb7deede2a97eae10d96d3de58397989d (diff)
downloaddeluge-ec4772068609b5d89d5a6bfb8f9c1ca1bb35704d.tar.gz
deluge-ec4772068609b5d89d5a6bfb8f9c1ca1bb35704d.tar.bz2
deluge-ec4772068609b5d89d5a6bfb8f9c1ca1bb35704d.zip
[WebUI] Enable debug URL parameter to parse false values
When installed as a development version there was no way to load the normal js scripts so improve the debug arg handling by parsing for false values to force use of normal type scripts. Since debug arg overrides dev, leave dev as is.
Diffstat (limited to 'deluge/ui/web/server.py')
-rw-r--r--deluge/ui/web/server.py19
1 files changed, 14 insertions, 5 deletions
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index b83cd4a18..15d4c4353 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -563,14 +563,23 @@ class TopLevel(resource.Resource):
return resource.Resource.getChildWithDefault(self, path, request)
def render(self, request):
- uri_true = ('true', 'yes', '1')
- debug_arg = request.args.get('debug', [b''])[-1].decode().lower() in uri_true
+ uri_true = ('true', 'yes', 'on', '1')
+ uri_false = ('false', 'no', 'off', '0')
+
+ debug_arg = None
+ req_dbg_arg = request.args.get('debug', [b''])[-1].decode().lower()
+ if req_dbg_arg in uri_true:
+ debug_arg = True
+ elif req_dbg_arg in uri_false:
+ debug_arg = False
+
dev_arg = request.args.get('dev', [b''])[-1].decode().lower() in uri_true
dev_ver = 'dev' in common.get_version()
script_type = 'normal'
- if debug_arg:
- script_type = 'debug'
+ if debug_arg is not None:
+ # Use debug arg to force switching to normal script type.
+ script_type = 'debug' if debug_arg else 'normal'
elif dev_arg or dev_ver:
# Also use dev files if development version.
script_type = 'dev'
@@ -606,7 +615,7 @@ class TopLevel(resource.Resource):
return template.render(
scripts=scripts,
stylesheets=self.stylesheets,
- debug=str(debug_arg).lower(),
+ debug=str(bool(debug_arg)).lower(),
base=web_config['base'],
js_config=js_config,
)