diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-05-26 15:21:54 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-05-26 15:21:54 +0200 |
| commit | 88fda31e98c367acb46ececfffb5105763506d88 (patch) | |
| tree | 0c63372a171b2da2a1223ff609e691735d4fdd31 /ishtar_common/context_processors.py | |
| parent | cd39cd6a351c9e25b65938e95cb5129ca463a9a2 (diff) | |
| parent | 7b43d9761a89ba469334ce36f3260e40378faaeb (diff) | |
| download | Ishtar-88fda31e98c367acb46ececfffb5105763506d88.tar.bz2 Ishtar-88fda31e98c367acb46ececfffb5105763506d88.zip | |
Merge branch 'newstyle'
Conflicts:
ishtar_common/static/media/style.css
Diffstat (limited to 'ishtar_common/context_processors.py')
| -rw-r--r-- | ishtar_common/context_processors.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 55774ef04..293a5ad44 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -51,11 +51,15 @@ def get_base_context(request): menu.init() request.session['MENU'] = menu """ # temporary disabled - menu = Menu(request.user) - menu.init() - request.session['MENU'] = menu + current_action = None if 'CURRENT_ACTION' in request.session: dct['CURRENT_ACTION'] = request.session['CURRENT_ACTION'] + current_action = dct['CURRENT_ACTION'] + menu = Menu(request.user, current_action=current_action) + menu.init() + if menu.selected_idx != None: + dct['current_theme'] = "theme-%d" % (menu.selected_idx+1) + request.session['MENU'] = menu dct['MENU'] = request.session['MENU'] dct['JQUERY_URL'] = settings.JQUERY_URL dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL |