Changeset 1585 for trunk/pylucid/PyLucid/install/BaseInstall.py

Timestamp:

05/23/08 16:33:49 (6 months ago)

Author:

JensDiemer

Message:

new page_msg system. Use a middleware to make page_msg lazy: ticket:193

• update settings_example.py (insert new middleware)
  
• change """contextpage_msg?""" to """request.page_msg"""
  
• add a simple page_msg unittest (Need more tests!)
  
• update _install data (Templates and index page)
  

Files:

• trunk/pylucid/PyLucid/install/BaseInstall.py (modified) (5 diffs)

trunk/pylucid/PyLucid/install/BaseInstall.py

@@ -130 +130 @@
 
         self.page_msg = PageMessages(self.context)
-        self.context["page_msg"] = self.page_msg
-
-        # Redirect every "warning" messages into context["page_msg"]:
-        redirect_warnings(self.context["page_msg"])
+        self.request.page_msg = self.page_msg
+
+        # Redirect every "warning" messages into request.page_msg:
+        redirect_warnings(self.request.page_msg)
 
     #___________________________________________________________________________
@@ -145 +145 @@
 
         if msg and msg != "": # insert the messages:
-            self.context["page_msg"].write(msg)
+            self.request.page_msg.write(msg)
 
         return render_to_response(
@@ -172 +172 @@
             # Cookie is not set or the salt hash value compair failed
             if DEBUG:
-                self.context["page_msg"].write("DEBUG: %s" % msg)
+                self.request.page_msg.write("DEBUG: %s" % msg)
         else:
             # access ok -> start the normal _install view() method
@@ -190 +190 @@
                 except WrongPassword, msg:
                     # Display the form again
-                    self.context["page_msg"].write(msg)
+                    self.request.page_msg.write(msg)
                 else:
                     # Password is ok. -> process the normal _instal view()
@@ -205 +205 @@
 
         self.context["no_menu_link"] = True # no "back to menu" link
-#        self.context["page_msg"].write(_("Please input the password"))
+#        self.request.page_msg.write(_("Please input the password"))
         return render_to_response("install_login.html", self.context)