[Mpuls-commits] r1310 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-08 12:42:16 +0100 (Mon, 08 Feb 2010)
New Revision: 1310

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/navigation.py
Log:
* waskaweb/controllers/navigation.py: Fix formatting.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-08 11:41:32 UTC (rev 1309)
+++ wasko/branches/2.0/ChangeLog	2010-02-08 11:42:16 UTC (rev 1310)
@@ -1,5 +1,9 @@
 2010-02-08  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/navigation.py: Fix formatting.
+
+2010-02-08  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/document.py: Fix formatting.
 
 2010-02-08  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/navigation.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/navigation.py	2010-02-08 11:41:32 UTC (rev 1309)
+++ wasko/branches/2.0/waskaweb/controllers/navigation.py	2010-02-08 11:42:16 UTC (rev 1310)
@@ -1,27 +1,27 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
-# 
-# This file is part of mpuls WASKA (CoMPUter-based case fiLeS - 
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
 # Web-Anwendungs-Server fuer Kompetenzagenturen).
-# 
+#
 # mpuls WASKA is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Affero General Public License as published by the
 # Free Software Foundation, either version 3 of the License, or (at your
 # option) any later version.
-# 
+#
 # mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
 # License for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public
 # License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
-# 
-# mpuls WASKA has been developed on behalf of the 
+#
+# mpuls WASKA has been developed on behalf of the
 # Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
 # within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
-# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and 
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
 # European Social Fund resources.
 #
 # Authors:
@@ -29,19 +29,22 @@
 # Sascha L. Teichmann <teichmann at intevation.de>
 #
 
+import sys
 import logging
-from paste.httpexceptions           import HTTPNotFound
 
-from waskaweb.controllers.CaseBase  import CasebaseController 
-from waskaweb.controllers.case      import CaseController 
-from mpulsweb.lib.security          import checkRole
-from waskaweb.lib.base              import *
-from mpulsweb.lib.navigation        import mark_folderopen, mark_folderclose 
+from paste.httpexceptions import HTTPNotFound
+
+from mpulsweb.lib.navigation import mark_folderopen, mark_folderclose
+from mpulsweb.lib.security import checkRole
+
+from waskaweb.controllers.CaseBase import CasebaseController
+from waskaweb.controllers.case import CaseController
+from waskaweb.lib.base import *
 from waskaweb.controllers.formularpage import FormularpageController
 
+
 log = logging.getLogger(__name__)
 
-import sys
 
 class NavigationController(CasebaseController):
 
@@ -56,27 +59,34 @@
         print id
         self.navigation = session['navigation.tree']
         tree_item = self.navigation.getTreeItem(id)
-        if not tree_item: raise HTTPNotFound()
+        if not tree_item:
+            raise HTTPNotFound()
         opened_folders = tree_item.unfold()
         for ti in opened_folders:
             mark_folderopen(ti)
         tree_item = tree_item.deepest_item()
         page_id = tree_item.key
-        return FormularpageController().select(session.get('navigation.selectedpage', page_id))
+        return FormularpageController().select(session.get('navigation'
+                                                           '.selectedpage',
+                                                           page_id))
 
     def close_branch(self, id):
         self.navigation = session['navigation.tree']
         tree_item = self.navigation.getTreeItem(id)
-        if not tree_item: raise HTTPNotFound()
+        if not tree_item:
+            raise HTTPNotFound()
         tree_item.set_open(False)
         mark_folderclose(tree_item)
         page_id = tree_item.key
-        return FormularpageController().select(session.get('navigation.selectedpage', page_id))
+        return FormularpageController().select(session.get('navigation'
+                                                           '.selectedpage',
+                                                           page_id))
 
     def select_branch(self, id):
         self.navigation = session['navigation.tree']
         tree_item = self.navigation.getTreeItem(id)
-        if not tree_item: raise HTTPNotFound()
+        if not tree_item:
+            raise HTTPNotFound()
         tree_item = tree_item.deepest_item()
         opened_folders = tree_item.unfold()
         for ti in opened_folders:
@@ -85,7 +95,9 @@
         page_id = tree_item.key
         session['navigation.selectedpage'] = page_id
         session.save()
-        return FormularpageController().select(session.get('navigation.selectedpage', page_id))
+        return FormularpageController().select(session.get('navigation'
+                                                           '.selectedpage',
+                                                           page_id))
 
     #def __ensure_selected_page(self, case, tree_item):
     #    page_id = case.page_id