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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-20 16:06:06 +0100 (Wed, 20 Jan 2010)
New Revision: 788

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


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-20 14:26:56 UTC (rev 787)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-20 15:06:06 UTC (rev 788)
@@ -1,5 +1,9 @@
 2010-01-20  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/waska.py: Fix formatting
+
+2010-01-20  Bernhard Herzog  <bh at intevation.de>
+
 	Fix application logic:
 
 	* waskaweb/controllers/waska.py (get_remindlist): always return

Modified: wasko/branches/2.0/waskaweb/controllers/waska.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/waska.py	2010-01-20 14:26:56 UTC (rev 787)
+++ wasko/branches/2.0/waskaweb/controllers/waska.py	2010-01-20 15:06:06 UTC (rev 788)
@@ -1,27 +1,27 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2007, 2008, 2010 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:
@@ -30,24 +30,24 @@
 #
 
 import logging
-
-from waskaweb.lib.base     import *
-from waskaweb.lib.search   import INCONSISTENCY_CHECK_AFTER 
-from waskaweb.lib.security import checkLogin, userIdentity, generateID, checkRole
-from waskaweb.model.user   import UserObject
-from waskaweb.model.case   import CaseOverview
-from waskaweb.model.news   import NewsList
-from waskaweb.model.appointment import MaxSaveTimeReminderOverview, \
-                                       CaseAppointmentOverview, \
-                                       GlobalAppointmentOverview, \
-                                       CaseReminderOverview
-
 import md5
 from datetime import datetime
 from sets import Set
 
+from waskaweb.lib.base import *
+from waskaweb.lib.search import INCONSISTENCY_CHECK_AFTER
+from waskaweb.lib.security import checkLogin, userIdentity, generateID, \
+     checkRole
+from waskaweb.model.user import UserObject
+from waskaweb.model.case import CaseOverview
+from waskaweb.model.news import NewsList
+from waskaweb.model.appointment import MaxSaveTimeReminderOverview, \
+     CaseAppointmentOverview, GlobalAppointmentOverview, CaseReminderOverview
+
+
 log = logging.getLogger(__name__)
 
+
 def get_remindlist():
     """Return an AppointmentOverview instance with reminders.
     The overview always contains the max save time reminders. For case
@@ -70,8 +70,11 @@
 
 
 MARK_NEWS_AS_READ_CONFIRM = u"""Nachricht als gelesen markieren"""
-MARK_NEWS_AS_READ_CONFIRM_TEXT = u"""Wollen Sie die Nachricht wirklich als gelesen markieren? Sie wird dadurch dauerhaft aus der Übersicht entfernt."""
+MARK_NEWS_AS_READ_CONFIRM_TEXT = u"""\
+Wollen Sie die Nachricht wirklich als gelesen markieren?
+Sie wird dadurch dauerhaft aus der Übersicht entfernt."""
 
+
 class WaskaController(BaseController):
 
     def index(self):
@@ -103,7 +106,7 @@
         return render('/start/start.mako')
 
     def markNewsAsRead(self, id, confirmed=0):
-        id        = self._checkInt(id)
+        id = self._checkInt(id)
         confirmed = self._checkBool(confirmed)
         session_user = session['USER_AUTHORIZED']
         try:
@@ -113,22 +116,22 @@
                 return self.start()
             else:
                 c.confirm_for = MARK_NEWS_AS_READ_CONFIRM
-                c.question    = MARK_NEWS_AS_READ_CONFIRM_TEXT
-                c.url_yes     = "/waska/markNewsAsRead/%s/1" % id
-                c.url_no      = "/waska"
+                c.question = MARK_NEWS_AS_READ_CONFIRM_TEXT
+                c.url_yes = "/waska/markNewsAsRead/%s/1" % id
+                c.url_no = "/waska"
                 return render('/start/dialogs/confirm_mark_news_as_read.mako')
         except:
             return render('/tests/trace.mako')
 
     def help(self):
-        return render('/start/help.mako') 
+        return render('/start/help.mako')
 
     def settings(self, id):
         id = self._checkInt(id)
         redirect_to(controller="usersettings", action="showSettings", id=id)
 
     def info(self):
-        return render('/start/responsible.mako') 
+        return render('/start/responsible.mako')
 
     def logout(self):
         # XXX: invalidate() does not delete backend data :-/
@@ -143,9 +146,9 @@
 
     def loginAction(self):
         try:
-            login  = request.params.getone('username')
+            login = request.params.getone('username')
             passwd = request.params.getone('password')
-            user   = checkLogin(login, passwd)
+            user = checkLogin(login, passwd)
             if user:
                 c.login_failed = False
                 shared = generateID()