diff options
| -rw-r--r-- | example_project/local_settings.py.sample | 9 | ||||
| -rw-r--r-- | ishtar_common/context_processors.py | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample index 082d23ba2..dd488d52e 100644 --- a/example_project/local_settings.py.sample +++ b/example_project/local_settings.py.sample @@ -26,6 +26,15 @@ DATABASES = { ROOT_URLCONF = 'example_project.urls' MEDIA_URL = 'http://mydomain/static/' +# if your installation uses a prefix after the domain name modify and uncomment +# theses lines +#DOMAIN_PREFIX = "/ishtar-test" +#LOGIN_URL = DOMAIN_PREFIX + '/accounts/login/' +#LOGIN_REDIRECT_URL = DOMAIN_PREFIX + '/accounts/profile/' +#LOGOUT_URL = DOMAIN_PREFIX + '/accounts/logout/' + + + # Ishtar custom SRID = 27572 ENCODING = '' # specific encoding for CSV export - default to utf-8 diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 884ec19b4..3581453cd 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -41,11 +41,16 @@ def get_base_context(request): dct = {'URL_PATH':settings.URL_PATH} dct["APP_NAME"] = Site.objects.get_current().name dct["COUNTRY"] = settings.COUNTRY + """ if 'MENU' not in request.session or \ request.session['MENU'].user != request.user: menu = Menu(request.user) menu.init() request.session['MENU'] = menu + """ # temporary disabled + menu = Menu(request.user) + menu.init() + request.session['MENU'] = menu if 'CURRENT_ACTION' in request.session: dct['CURRENT_ACTION'] = request.session['CURRENT_ACTION'] dct['MENU'] = request.session['MENU'] |