diff --git a/seahub/settings.py b/seahub/settings.py index 60ed588c26..76830866cf 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -213,7 +213,7 @@ INSTALLED_APPS = ( ) # Enabled or disable constance(web settings). -CONSTANCE_ENABLED = True +ENABLE_SETTINGS_VIA_WEB = True CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend' CONSTANCE_DATABASE_CACHE_BACKEND = 'default' @@ -624,8 +624,10 @@ if 'win32' in sys.platform: fp.write("%d\n" % os.getpid()) fp.close() +# Following settings are private, can not be overwrite. INNER_FILE_SERVER_ROOT = 'http://127.0.0.1:' + FILE_SERVER_PORT +CONSTANCE_ENABLED = ENABLE_SETTINGS_VIA_WEB CONSTANCE_CONFIG = { 'SERVICE_URL': (SERVICE_URL,''), 'FILE_SERVER_ROOT': (FILE_SERVER_ROOT,''), diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index b63175d515..d9004558d7 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -2182,7 +2182,7 @@ def sys_sudo_mode(request): def sys_settings(request): """List and change seahub settings in admin panel. """ - if not dj_settings.CONSTANCE_ENABLED: + if not dj_settings.ENABLE_SETTINGS_VIA_WEB: raise Http404 DIGIT_WEB_SETTINGS = ( diff --git a/tests/seahub/views/sysadmin/test_sys_settings.py b/tests/seahub/views/sysadmin/test_sys_settings.py index e8be915551..1d041d8947 100644 --- a/tests/seahub/views/sysadmin/test_sys_settings.py +++ b/tests/seahub/views/sysadmin/test_sys_settings.py @@ -13,6 +13,6 @@ class SysSettingsTest(BaseTestCase): self.assertEqual(200, resp.status_code) def test_can_not_render_if_setting_disabled(self): - with self.settings(CONSTANCE_ENABLED=False): + with self.settings(ENABLE_SETTINGS_VIA_WEB=False): resp = self.client.get(self.url) self.assertEqual(404, resp.status_code)