summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-26 12:54:32 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-26 12:54:32 +0200
commit64bc2cce4470fd336d66dd36a08d4f6dbf4ac2a1 (patch)
tree5c94e2c68e5a11830461a447b83554f2257b483b
parentf1d4e11b8acd97cbf29bc1e0b3e99c75a5b51f3a (diff)
downloadIshtar-64bc2cce4470fd336d66dd36a08d4f6dbf4ac2a1.tar.bz2
Ishtar-64bc2cce4470fd336d66dd36a08d4f6dbf4ac2a1.zip
Temporary fix for menu evaluation with Apache
-rw-r--r--example_project/local_settings.py.sample9
-rw-r--r--ishtar_common/context_processors.py5
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']