Changeset 103

Timestamp:

10/31/07 19:21:29 (14 months ago)

Author:

steadicat

Message:

Fixed updating session.

Files:

• django/trunk/middleware/messagesmiddleware.py (modified) (2 diffs)

django/trunk/middleware/messagesmiddleware.py

@@ -1 +1 @@
 
 class Messages(object):
-    def __init__(self, session):
+    def __init__(self):
         self.messages = []
-        self.session = session
+        self.modified = False
 
     def add(self, message):
+        self.modified = True
         self.messages.append(message)
-        self.session.modified = True
 
     def get(self):
         if len(self.messages) > 0:
-            yield self.messages.pop(0)
-            self.session.modified = True
+            self.modified = True
+            m = self.messages[:]
+            self.messages = []
+            return m
 
 class MessagesMiddleware(object):
@@ -18 +20 @@
     def process_request(self, request):
         if 'messages' not in request.session:
-            request.session['messages'] = Messages(request.session)
+            request.session['messages'] = Messages()
+
+    def process_response(self, request, response):
+        if request.session['messages'].modified:
+            request.session['messages'].modified = False
             request.session.modified = True
+        return response
 
 def context_processor(request):