haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 19:37:28 +00:00
Code Issues Releases Wiki Activity

Add ENABLE_SETTINGS_VIA_WEB setting and remoke CONSTANCE_ENABLED

Browse Source
This commit is contained in:
zhengxie
2016-05-27 10:32:36 +08:00
parent 1b9b18c2cb
commit 346c228495
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/settings.py
View File

@@ -213,7 +213,7 @@ INSTALLED_APPS = (
) )
# Enabled or disable constance(web settings). # Enabled or disable constance(web settings).
CONSTANCE_ENABLED = True ENABLE_SETTINGS_VIA_WEB = True
CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend' CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
CONSTANCE_DATABASE_CACHE_BACKEND = 'default' CONSTANCE_DATABASE_CACHE_BACKEND = 'default'
@@ -624,8 +624,10 @@ if 'win32' in sys.platform:
fp.write("%d\n" % os.getpid()) fp.write("%d\n" % os.getpid())
fp.close() fp.close()
# Following settings are private, can not be overwrite.
INNER_FILE_SERVER_ROOT = 'http://127.0.0.1:' + FILE_SERVER_PORT INNER_FILE_SERVER_ROOT = 'http://127.0.0.1:' + FILE_SERVER_PORT
CONSTANCE_ENABLED = ENABLE_SETTINGS_VIA_WEB
CONSTANCE_CONFIG = { CONSTANCE_CONFIG = {
'SERVICE_URL': (SERVICE_URL,''), 'SERVICE_URL': (SERVICE_URL,''),
'FILE_SERVER_ROOT': (FILE_SERVER_ROOT,''), 'FILE_SERVER_ROOT': (FILE_SERVER_ROOT,''),

2
seahub/views/sysadmin.py
View File

@@ -2182,7 +2182,7 @@ def sys_sudo_mode(request):
def sys_settings(request): def sys_settings(request):
"""List and change seahub settings in admin panel. """List and change seahub settings in admin panel.
""" """
if not dj_settings.CONSTANCE_ENABLED: if not dj_settings.ENABLE_SETTINGS_VIA_WEB:
raise Http404 raise Http404
DIGIT_WEB_SETTINGS = ( DIGIT_WEB_SETTINGS = (

2
tests/seahub/views/sysadmin/test_sys_settings.py
View File

@@ -13,6 +13,6 @@ class SysSettingsTest(BaseTestCase):
self.assertEqual(200, resp.status_code) self.assertEqual(200, resp.status_code)
def test_can_not_render_if_setting_disabled(self): 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) resp = self.client.get(self.url)
self.assertEqual(404, resp.status_code) self.assertEqual(404, resp.status_code)