Message mecanism with session ID

1 files changed, 8 insertions, 1 deletions

diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py
index 437ceb677..90817776f 100644
--- a/ishtar_common/context_processors.py
+++ b/ishtar_common/context_processors.py
@@ -43,12 +43,19 @@ def get_base_context(request):
         menu = Menu(request.user)
         menu.init()
         request.session['MENU'] = menu
-    """  # temporary disabled
+    """  # menu is now in cache - put it back in session later?
     current_action = None
     if 'CURRENT_ACTION' in request.session:
         dct['CURRENT_ACTION'] = request.session['CURRENT_ACTION']
         current_action = dct['CURRENT_ACTION']
     dct['CURRENT_PATH'] = request.path
+
+    # messages
+    dct['MESSAGES'] = []
+    if 'messages' in request.session and request.session['messages']:
+        for message, message_type in request.session['messages']:
+            dct['MESSAGES'].append((message, message_type))
+        request.session['messages'] = []
     menu = Menu(request.user, current_action=current_action,
                 session=request.session)
     menu.init()