nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with lost menus in Django 1.10

Browse Source
This commit is contained in:
Hemanth Kumar Veeranki 2016-08-09 17:35:29 +05:30 committed by James Valleroy
parent aad39e4001
commit 42e44ec689
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plinth/__main__.py
View File

@ -138,12 +138,6 @@ def setup_server():
def configure_django(): def configure_django():
"""Setup Django configuration in the absense of .settings file""" """Setup Django configuration in the absense of .settings file"""
# In module_loader.py we reverse URLs for the menu before having a proper
# request. In this case, get_script_prefix (used by reverse) returns the
# wrong prefix. Set it here manually to have the correct prefix right away.
django.core.urlresolvers.set_script_prefix(cfg.server_dir)
logging_configuration = { logging_configuration = {
'version': 1, 'version': 1,
'disable_existing_loggers': False, 'disable_existing_loggers': False,
@ -211,6 +205,7 @@ def configure_django():
{'ENGINE': 'django.db.backends.sqlite3', {'ENGINE': 'django.db.backends.sqlite3',
'NAME': cfg.store_file}}, 'NAME': cfg.store_file}},
DEBUG=cfg.debug, DEBUG=cfg.debug,
FORCE_SCRIPT_NAME=cfg.server_dir,
INSTALLED_APPS=applications, INSTALLED_APPS=applications,
LOGGING=logging_configuration, LOGGING=logging_configuration,
LOGIN_URL='users:login', LOGIN_URL='users:login',
@ -238,7 +233,7 @@ def configure_django():
TEMPLATES=templates, TEMPLATES=templates,
USE_L10N=True, USE_L10N=True,
USE_X_FORWARDED_HOST=cfg.use_x_forwarded_host) USE_X_FORWARDED_HOST=cfg.use_x_forwarded_host)
django.setup() django.setup(set_prefix=True)
logger.info('Configured Django with applications - %s', applications) logger.info('Configured Django with applications - %s', applications)