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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-15 18:17:06 +0100 (Mon, 15 Feb 2010)
New Revision: 1569

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


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-15 16:24:49 UTC (rev 1568)
+++ wasko/branches/2.0/ChangeLog	2010-02-15 17:17:06 UTC (rev 1569)
@@ -1,5 +1,9 @@
 2010-02-15  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/caseappointment.py: Fix formatting.
+
+2010-02-15  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/config.py (MpulsConfig.__init__): Do not catch
 	errors raised when the json file cannot be loaded.  If it cannot
 	be loaded, the application will not work correctly anyway, so it's

Modified: wasko/branches/2.0/waskaweb/controllers/caseappointment.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/caseappointment.py	2010-02-15 16:24:49 UTC (rev 1568)
+++ wasko/branches/2.0/waskaweb/controllers/caseappointment.py	2010-02-15 17:17:06 UTC (rev 1569)
@@ -2,15 +2,16 @@
 import logging
 from datetime import datetime
 
-import formencode 
+import formencode
 
 from pylons import request, response, session, tmpl_context as c
 from pylons.controllers.util import abort, redirect_to
 
 from mpulsweb.lib.security import checkRole
+from mpulsweb.lib.helpers import url_for, dd_mm_YYYY, HH_MM
+
 from waskaweb.lib.base import BaseController, render
-from mpulsweb.lib.helpers import url_for, dd_mm_YYYY, HH_MM 
-from waskaweb.lib.validators import CreateAppointmentForm 
+from waskaweb.lib.validators import CreateAppointmentForm
 from waskaweb.model.case import CaseFactory, LoadCaseNotExistsError
 from waskaweb.model.appointment import CaseAppointmentOverview, \
      CaseAppointmentFactory, CaseReminderOverview
@@ -40,7 +41,7 @@
 
     def index(self, id):
         return self.overview(id)
-    
+
     @checkRole(('admin_ka', 'cm_ka'))
     def overview(self, id):
         id = self._checkInt(id)
@@ -55,9 +56,9 @@
         c.form_result = {}
         cd = datetime.now()
         form_defaults = {'start_date': dd_mm_YYYY(cd),
-                           'start_time': HH_MM(cd),
-                           'case_id': id,
-                           'type': 0}
+                         'start_time': HH_MM(cd),
+                         'case_id': id,
+                         'type': 0}
         form = render('/casemanagement/newAppointment.mako')
         return formencode.htmlfill.render(unicode(form, 'utf-8'),
                                           defaults=form_defaults)
@@ -96,9 +97,7 @@
                 c.success_for = CREATE_APPOINT_NOTIFICATION_SUCCESS
                 c.success_text = CREATE_APPOINT_NOTIFICATION_TEXT_SUCCESS
                 c.url_ok = url_for(controller='/caseappointment',
-                                     action='index',
-                                     id=appointment.case_id)
-
+                                   action='index', id=appointment.case_id)
                 return render('/casemanagement/dialogs/success_create_appointment.mako')
             except formencode.Invalid, error:
                 form_result = error.value
@@ -163,9 +162,8 @@
                 c.success_for = EDIT_APPOINT_NOTIFICATION_SUCCESS
                 c.success_text = EDIT_APPOINT_NOTIFICATION_TEXT_SUCCESS
                 c.url_ok = url_for(controller='/caseappointment',
-                                     action='index',
-                                     id=appointment.case_id)
-
+                                   action='index',
+                                   id=appointment.case_id)
                 return render('/casemanagement/dialogs/success_edit_appointment.mako')
             except formencode.Invalid, error:
                 c.form_result = error.value