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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-25 19:09:53 +0100 (Mon, 25 Jan 2010)
New Revision: 849

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


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-25 18:07:53 UTC (rev 848)
+++ wasko/branches/2.0/ChangeLog	2010-01-25 18:09:53 UTC (rev 849)
@@ -1,5 +1,9 @@
 2010-01-25  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/CaseBase.py: Fix formatting
+
+2010-01-25  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/CaseBase.py: Removed unused imports
 
 2010-01-25  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/CaseBase.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/CaseBase.py	2010-01-25 18:07:53 UTC (rev 848)
+++ wasko/branches/2.0/waskaweb/controllers/CaseBase.py	2010-01-25 18:09:53 UTC (rev 849)
@@ -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:
@@ -31,12 +31,15 @@
 import paste
 import logging
 
-from paste.httpexceptions       import HTTPNotFound
-from waskaweb.lib.base          import *
-from waskaweb.model.case        import CaseFactory, LoadCaseNotExistsError 
+from paste.httpexceptions import HTTPNotFound
 
+from waskaweb.lib.base import *
+from waskaweb.model.case import CaseFactory, LoadCaseNotExistsError
+
+
 log = logging.getLogger(__name__)
 
+
 class CasebaseController(BaseController):
 
     def __before__(self):
@@ -47,29 +50,29 @@
         raise HTTPNotFound()
 
     def _loadCase(self, id):
-        factory   = CaseFactory()
+        factory = CaseFactory()
         try:
-            case = factory.loadById(id)
-            return case
+            return factory.loadById(id)
         except LoadCaseNotExistsError, err:
             self.showError()
 
     def getNavigation(self):
-        if self.navigation: return self.navigation
+        if self.navigation:
+            return self.navigation
         redirect_to(h.url_for(controller='/case_overview'))
 
     def _setState(self, id, state):
-        id      = self._checkInt(id)
-        state   = self._checkInt(state)
+        id = self._checkInt(id)
+        state = self._checkInt(state)
         try:
-            case  = self._loadCase(id)
+            case = self._loadCase(id)
             case_state = case.getState()
             case_state.setState(state)
             session_case = session.get('case')
             session_state = session_case.getState()
             session_state.setState(state)
             session.save()
-            return True 
+            return True
         except:
             return False