Changeset 4478

Timestamp:

20/11/08 17:33:01 (12 years ago)

Author:

cbyrom

Message:

Create new util to save the current editor state into a session variable + add code to track this so that the tab state can be roughly
maintained when swapping between tabs.

Location:

MILK/trunk/milk_server/milk_server

Files:

• controllers/atom_editor/editatom.py (modified) (5 diffs)
• controllers/atom_editor/listatom.py (modified) (4 diffs)
• lib/atomutilities.py (added)

MILK/trunk/milk_server/milk_server/controllers/atom_editor/editatom.py

@@ -23 +23 @@
 import milk_server.lib.htmlUtilities as utils
 from granulatorTool.granulite import granulite as granulite
+from milk_server.lib.atomutilities import savePageAndRender
 
 class EditatomController(BaseController):
@@ -314 +315 @@
 
         try:
-            return render("genshi", 'atom_editor/atom_editor')
+            return savePageAndRender(self.pathInfo, "atom_editor/atom_editor")
         
         except ExpatError, e:
@@ -329 +330 @@
         
         response.status_code = 400
-        return render('error')
+        return render('atom_editor/error')
 
 
@@ -589 +590 @@
 
         try:
-            return render("genshi", 'atom_editor/atom_creator')
+            return savePageAndRender(self.pathInfo, 'atom_editor/atom_creator')
 
         except Exception, e:
@@ -603 +604 @@
         
         try:
-            return render("genshi", 'atom_editor/atom_granulator')
+            return savePageAndRender(self.pathInfo, 'atom_editor/atom_granulator')
 
         except Exception, e:

MILK/trunk/milk_server/milk_server/controllers/atom_editor/listatom.py

@@ -22 +22 @@
 import milk_server.lib.htmlUtilities as utils
 from editatom import EditatomController as ec
+from milk_server.lib.atomutilities import savePageAndRender
 
 
@@ -51 +52 @@
         logging.info("Rendering atom home page")
         c.title = "Atom Editor Home Page"
-        return render("genshi", "atom_editor/atom_home")
+        return savePageAndRender(self.pathInfo, "atom_editor/atom_home")
 
     
@@ -128 +129 @@
                                                      selected = inputs.get('providerID'))
 
-            return render("genshi", 'atom_editor/atom_list')
+            return savePageAndRender(self.pathInfo, 'atom_editor/atom_list')
 
         except Exception, e:
@@ -138 +139 @@
         
         response.status_code = 400
-        return render("genshi", 'error')
+        return render("genshi", 'atom_editor/error')