[Mpuls-commits] r2211 - in wasko/branches/2.0: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-25 20:08:02 +0100 (Thu, 25 Mar 2010)
New Revision: 2211

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/controllers/case.py
Log:
* mpulsweb/controllers/case.py: Fix formatting.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-25 19:05:20 UTC (rev 2210)
+++ wasko/branches/2.0/ChangeLog	2010-03-25 19:08:02 UTC (rev 2211)
@@ -1,5 +1,9 @@
 2010-03-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/case.py: Fix formatting.
+
+2010-03-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/administration.py: Fix formatting.
 
 2010-03-25  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/mpulsweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/case.py	2010-03-25 19:05:20 UTC (rev 2210)
+++ wasko/branches/2.0/mpulsweb/controllers/case.py	2010-03-25 19:08:02 UTC (rev 2211)
@@ -10,12 +10,12 @@
 from mpulsweb.lib.base import BaseController, render, h
 from mpulsweb.lib.navigation import get_navigation
 from mpulsweb.lib.security import checkRole
-from mpulsweb.lib.dialogs import checkPrivacyStatement 
+from mpulsweb.lib.dialogs import checkPrivacyStatement
 from mpulsweb.lib.validators import SetStandinForm, SetEditorForm
 from mpulsweb.lib.anonymize import determineAnonymizedCaseEndPhase
 from mpulsweb.model.case import ConsistenceCheckException, SessionCase
 from mpulsweb.model.user import UserGroupList, UserListObject
-from mpulsweb.model.logbook import LogbookEntry 
+from mpulsweb.model.logbook import LogbookEntry
 
 from mpulsweb.controllers.formularpage import get_rendered_page
 
@@ -55,8 +55,10 @@
 Wollen Sie wirklich die Fallakte wiederherstellen? Die Fallakte ist
 danach wieder für die Nutzer bearbeitbar."""
 
+
 log = logging.getLogger(__name__)
 
+
 class CaseController(BaseController):
 
     def init_case(self, id):
@@ -107,7 +109,7 @@
             case.setState(3)
             c.dialog_title = u'Fallakte gelöscht!'
             c.dialog_text = (u"Die Fallakte wurde zum Löschen an die"
-                              " Administration weitergeleitet.")
+                             u" Administration weitergeleitet.")
             c.url_ok = h.url_for(controller="/case_overview")
             return render('/casemanagement/dialogs/success_delete_cm.mako')
         else:
@@ -155,12 +157,12 @@
         confirmed = self._checkBool(confirmed)
         case = self._loadCase(id)
 
-        # First check if the case is in a state which allows anonymization 
+        # First check if the case is in a state which allows anonymization
         try:
             case.check_anonymizeability()
         except ConsistenceCheckException, e:
-            c.dialog_title =  MARKANONYMIZE_FAILED
-            c.dialog_text  =  e.value 
+            c.dialog_title = MARKANONYMIZE_FAILED
+            c.dialog_text = e.value
             c.url_ok = url
             return render('/casemanagement/dialogs/failed_markanonymize.mako')
 
@@ -182,7 +184,7 @@
             c.dialog_title = ANONYMIZE_CONFIRM
             c.dialog_text = MARKANONYMIZE_CONFIRM_TEXT % phase
             c.url_yes = "/case/markForAnonymize/%s/1" % id
-            c.url_no = url 
+            c.url_no = url
             return render('/casemanagement/dialogs/confirm_markanonymize.mako')
 
     @checkRole('admin')
@@ -191,12 +193,12 @@
         confirmed = self._checkBool(confirmed)
         case = self._loadCase(id)
 
-        # First check if the case is in a state which allows anonymization 
+        # First check if the case is in a state which allows anonymization
         try:
             case.check_anonymizeability()
         except ConsistenceCheckException, e:
-            c.dialog_title =  MARKANONYMIZE_FAILED
-            c.dialog_text  =  e.value 
+            c.dialog_title = MARKANONYMIZE_FAILED
+            c.dialog_text = e.value
             c.url_ok = "/case/digest/%s" % id
             return render('/casemanagement/dialogs/failed_markanonymize.mako')
 
@@ -217,7 +219,7 @@
             return render('/casemanagement/dialogs/confirm_anonymize.mako')
 
     #
-    # Restore 
+    # Restore
     #
 
     @checkRole('admin')
@@ -269,7 +271,7 @@
 
     #
     # Create new case
-    # 
+    #
 
     @checkRole('cm')
     def new(self):
@@ -364,8 +366,7 @@
         c.entry = entry
         c.form_errors = {}
         form = render('/logbook/new.mako')
-        return formencode.htmlfill.render(form,
-                                          defaults=form_defaults,
+        return formencode.htmlfill.render(form, defaults=form_defaults,
                                           auto_insert_errors=False,
                                           errors=c.form_errors)