Fix saving of web_root. Fixes #7835 (#7841)

* Catch indexer specific exceptions in show refresh * Fix saving of web_root * Fix test
pymedusa · Mar 15, 2020 · 66583ba · 66583ba
1 parent 5dba492
commit 66583ba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/medusa/server/api/v2/config.py b/medusa/server/api/v2/config.py
@@ -127,6 +127,7 @@ class ConfigHandler(BaseRequestHandler):
         'webInterface.httpsKey': StringField(app, 'HTTPS_KEY'),
         'webInterface.handleReverseProxy': BooleanField(app, 'HANDLE_REVERSE_PROXY'),
 
+        'webRoot': StringField(app, 'WEB_ROOT'),
         'cpuPreset': StringField(app, 'CPU_PRESET'),
         'sslVerify': BooleanField(app, 'SSL_VERIFY'),
         'sslCaBundle': StringField(app, 'SSL_CA_BUNDLE'),
@@ -657,6 +658,7 @@ def data_main():
         section_data['webInterface']['httpsKey'] = app.HTTPS_KEY
         section_data['webInterface']['handleReverseProxy'] = bool(app.HANDLE_REVERSE_PROXY)
 
+        section_data['webRoot'] = app.WEB_ROOT
         section_data['cpuPreset'] = app.CPU_PRESET
         section_data['sslVerify'] = bool(app.SSL_VERIFY)
         section_data['sslCaBundle'] = app.SSL_CA_BUNDLE

diff --git a/tests/apiv2/test_config.py b/tests/apiv2/test_config.py
@@ -115,6 +115,7 @@ def config_main(monkeypatch, app_config):
     section_data['webInterface']['httpsKey'] = app.HTTPS_KEY
     section_data['webInterface']['handleReverseProxy'] = bool(app.HANDLE_REVERSE_PROXY)
 
+    section_data['webRoot'] = app.WEB_ROOT
     section_data['cpuPreset'] = app.CPU_PRESET
     section_data['sslVerify'] = bool(app.SSL_VERIFY)
     section_data['sslCaBundle'] = app.SSL_CA_BUNDLE

diff --git a/themes-default/slim/src/components/config-general.vue b/themes-default/slim/src/components/config-general.vue
@@ -283,7 +283,7 @@
                                         <p>accept the following reverse proxy headers (advanced)...<br>(X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Proto)</p>
                                     </config-toggle-slider>
 
-                                    <config-textbox v-model="system.webRoot" label="HTTP web root" id="web_root" autocomplete="no">
+                                    <config-textbox v-model="config.webRoot" label="HTTP web root" id="web_root" autocomplete="no">
                                         <p>Set a base URL, for use in reverse proxies.</p>
                                         <p>blank = disabled</p>
                                         <p><b>Note:</b> Must restart to have effect. Keep in mind that any previously configured base URLs won't work, after this change.</p>

diff --git a/themes/dark/assets/js/medusa-runtime.js b/themes/dark/assets/js/medusa-runtime.js
diff --git a/themes/light/assets/js/medusa-runtime.js b/themes/light/assets/js/medusa-runtime.js