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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-25 20:26:27 +0100 (Thu, 25 Mar 2010)
New Revision: 2215

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


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-25 19:22:17 UTC (rev 2214)
+++ wasko/branches/2.0/ChangeLog	2010-03-25 19:26:27 UTC (rev 2215)
@@ -1,5 +1,9 @@
 2010-03-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/caseappointment.py: Fix formatting.
+
+2010-03-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/case_overview.py: Fix formatting.
 
 2010-03-25  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/mpulsweb/controllers/caseappointment.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/caseappointment.py	2010-03-25 19:22:17 UTC (rev 2214)
+++ wasko/branches/2.0/mpulsweb/controllers/caseappointment.py	2010-03-25 19:26:27 UTC (rev 2215)
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 import logging
 from datetime import datetime
 
@@ -23,8 +24,10 @@
      EDIT_APPOINT_NOTIFICATION_SUCCESS, \
      EDIT_APPOINT_NOTIFICATION_TEXT_SUCCESS
 
+
 log = logging.getLogger(__name__)
 
+
 class CaseappointmentController(BaseController):
 
     def index(self, id):
@@ -48,8 +51,7 @@
                          'case_id': id,
                          'type': 0}
         form = render('/casemanagement/newAppointment.mako')
-        return formencode.htmlfill.render(form,
-                                          defaults=form_defaults)
+        return formencode.htmlfill.render(form, defaults=form_defaults)
 
     @checkRole('cm_ka')
     def newReminder(self, id):
@@ -66,8 +68,7 @@
                                          u" die Wiedervorlage ein"),
                          'type': 1}
         form = render('/casemanagement/newAppointment.mako')
-        return formencode.htmlfill.render(form,
-                                          defaults=form_defaults)
+        return formencode.htmlfill.render(form, defaults=form_defaults)
 
     @checkRole(('cm_ka'))
     def newAction(self):
@@ -86,13 +87,13 @@
                 c.success_text = CREATE_APPOINT_NOTIFICATION_TEXT_SUCCESS
                 c.url_ok = url_for(controller='/caseappointment',
                                    action='index', id=appointment.case_id)
-                return render('/casemanagement/dialogs/success_create_appointment.mako')
+                return render('/casemanagement/dialogs/'
+                              'success_create_appointment.mako')
             except formencode.Invalid, error:
                 c.form_result = error.value
                 c.form_errors = error.error_dict or {}
                 form = render('/casemanagement/newAppointment.mako')
-                return formencode.htmlfill.render(form,
-                                                  defaults=form_result,
+                return formencode.htmlfill.render(form, defaults=form_result,
                                                   auto_insert_errors=False,
                                                   errors=form_errors)
         except Exception, e:
@@ -135,8 +136,7 @@
         c.form_errors = {}
         c.appointment = app
         form = render('/casemanagement/editAppointment.mako')
-        return formencode.htmlfill.render(form,
-                                          defaults=c.form_result,
+        return formencode.htmlfill.render(form, defaults=c.form_result,
                                           auto_insert_errors=False,
                                           errors=c.form_errors)
 
@@ -158,14 +158,14 @@
                 c.url_ok = url_for(controller='/caseappointment',
                                    action='index',
                                    id=appointment.case_id)
-                return render('/casemanagement/dialogs/success_edit_appointment.mako')
+                return render('/casemanagement/dialogs/'
+                              'success_edit_appointment.mako')
             except formencode.Invalid, error:
                 c.form_result = error.value
                 c.form_errors = error.error_dict or {}
                 c.appointment = factory.loadById(c.form_result.get('id'))
                 form = render('/casemanagement/editAppointment.mako')
-                return formencode.htmlfill.render(form,
-                                                  defaults=c.form_result,
+                return formencode.htmlfill.render(form, defaults=c.form_result,
                                                   auto_insert_errors=False,
                                                   errors=c.form_errors)
         except Exception, e:
@@ -182,12 +182,14 @@
             c.success_for = DELETE_APPOINT_NOTIFICATION_SUCCESS
             c.success_text = DELETE_APPOINT_NOTIFICATION_TEXT_SUCCESS
             c.url_ok = "/caseappointment/index/%s" % appointment.case_id
-            return render('/casemanagement/dialogs/success_delete_appointment.mako')
+            return render('/casemanagement/dialogs/'
+                          'success_delete_appointment.mako')
         else:
             c.context = "../main.mako"
             c.confirm_for = DELETE_APPOINT_CONFIRM
             c.question = DELETE_APPOINT_CONFIRM_TEXT
             c.url_yes = "/caseappointment/delete/%s/1" % id
             c.url_no = "/caseappointment/index/%s" % appointment.case_id
-            return render('/casemanagement/dialogs/confirm_delete_appointment.mako')
+            return render('/casemanagement/dialogs/'
+                          'confirm_delete_appointment.mako')