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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-09 16:09:33 +0100 (Tue, 09 Feb 2010)
New Revision: 1400

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


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-09 15:04:50 UTC (rev 1399)
+++ wasko/branches/2.0/ChangeLog	2010-02-09 15:09:33 UTC (rev 1400)
@@ -1,5 +1,9 @@
 2010-02-09  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/annotations.py: Fix formatting.
+
+2010-02-09  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py (Case.aliases): Some more fields have to
 	be copied to the SessionCase: street, streetnr, plz, city
 

Modified: wasko/branches/2.0/waskaweb/controllers/annotations.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/annotations.py	2010-02-09 15:04:50 UTC (rev 1399)
+++ wasko/branches/2.0/waskaweb/controllers/annotations.py	2010-02-09 15:09:33 UTC (rev 1400)
@@ -5,36 +5,40 @@
 from pylons import request, response, session, c
 from pylons.controllers.util import abort, redirect_to
 
-from mpulsweb.lib.security         import checkRole
+from mpulsweb.lib.security import checkRole
 from waskaweb.lib.base import BaseController, render
 
 log = logging.getLogger(__name__)
 
+
 class AnnotationsController(BaseController):
 
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
     def help(self, id):
         nc = g.formedTree.findByName(id)
-        if not nc: return abort('404', _('No help available'))
-        c.annotation_header =  _('Help') 
-        c.annotation_title  =  nc.getDescription()
-        c.annotation_text   =  nc.getHelp()
+        if not nc:
+            return abort('404', _('No help available'))
+        c.annotation_header = _('Help')
+        c.annotation_title = nc.getDescription()
+        c.annotation_text = nc.getHelp()
         return render('/annotations/annotation.mako')
 
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
     def required(self, id):
         nc = g.formedTree.findByName(id)
-        if not nc: return abort('404', _('No help available'))
-        c.annotation_header =  _('Required field') 
-        c.annotation_title =  nc.getDescription()
-        c.annotation_text   =  nc.getRequired()
+        if not nc:
+            return abort('404', _('No help available'))
+        c.annotation_header = _('Required field')
+        c.annotation_title = nc.getDescription()
+        c.annotation_text = nc.getRequired()
         return render('/annotations/annotation.mako')
 
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
     def evaluation(self, id):
         nc = g.formedTree.findByName(id)
-        if not nc: return abort('404', _('No help available'))
-        c.annotation_header =  _('Evaluation relevant field') 
-        c.annotation_title =  nc.getDescription()
-        c.annotation_text   =  nc.getEvaluation()
+        if not nc:
+            return abort('404', _('No help available'))
+        c.annotation_header = _('Evaluation relevant field')
+        c.annotation_title = nc.getDescription()
+        c.annotation_text = nc.getEvaluation()
         return render('/annotations/annotation.mako')