3 files changed, 9 insertions, 7 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py
index 5050d667e..1c3babb8f 100644
--- a/ishtar_common/context_processors.py
+++ b/ishtar_common/context_processors.py
@@ -50,8 +50,7 @@ def get_base_context(request):
     menu.init()
     if menu.selected_idx is not None:
         dct['current_theme'] = "theme-%d" % (menu.selected_idx + 1)
-    request.session['MENU'] = menu
-    dct['MENU'] = request.session['MENU']
+    dct['MENU'] = menu
     dct['JQUERY_URL'] = settings.JQUERY_URL
     dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL
     dct['COUNTRY'] = settings.COUNTRY
diff --git a/ishtar_common/menus.py b/ishtar_common/menus.py
index 36b53b162..7d24b0fd2 100644
--- a/ishtar_common/menus.py
+++ b/ishtar_common/menus.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2013 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2017 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -23,7 +23,6 @@ Menus
 
 from django.conf import settings
 
-
 _extra_menus = []
 # collect menu from INSTALLED_APPS
 for app in settings.INSTALLED_APPS:
diff --git a/ishtar_common/templatetags/link_to_window.py b/ishtar_common/templatetags/link_to_window.py
index 14e4bd6c7..f157b6255 100644
--- a/ishtar_common/templatetags/link_to_window.py
+++ b/ishtar_common/templatetags/link_to_window.py
@@ -60,12 +60,16 @@ def add_links(items, extra_attr=''):
                         takes_context=True)
 def modify_toolbar(context, item, action):
     request = context.get('request')
-    items_by_idx = request.session['MENU'].items_by_idx.keys()
+    menu = context.get('MENU', None)
+    print("TODO: link_to_window - check")
+    if not menu:
+        return {}
+    items_by_idx = menu.items_by_idx.keys()
     if action not in items_by_idx:
         return {}
-    menu = request.session['MENU'].items_by_idx[action]
+    action = menu.items_by_idx[action]
     user = request.user
     if not hasattr(user, 'ishtaruser') or \
-            not menu.is_available(user.ishtaruser, item):
+            not action.is_available(user.ishtaruser, item):
         return {}
     return {'item': item}