[Mpuls-commits] r1406 - wasko/branches/2.0/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-09 16:19:18 +0100 (Tue, 09 Feb 2010)
New Revision: 1406

Modified:
   wasko/branches/2.0/mpulsweb/controllers/settings.py
Log:
Fixed methodnames and import validator


Modified: wasko/branches/2.0/mpulsweb/controllers/settings.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/settings.py	2010-02-09 15:17:40 UTC (rev 1405)
+++ wasko/branches/2.0/mpulsweb/controllers/settings.py	2010-02-09 15:19:18 UTC (rev 1406)
@@ -7,6 +7,7 @@
 from pylons.controllers.util import abort, redirect_to
 
 from mpulsweb.lib.base import BaseController, render
+from mpulsweb.lib.validators import EditSettingsForm 
 from mpulsweb.lib.security import checkRole
 from mpulsweb.model.agencysettings import Agency
 
@@ -19,20 +20,23 @@
 
     @checkRole('admin_ka')
     def index(self):
+        return self.show()
+
+    def show(self):
         c.form_errors = {}
         c.form_result = {}
         c.agency = Agency()
         return render('/settings/show.mako')
 
     @checkRole('admin_ka')
-    def editSettings(self):
+    def edit(self):
         c.form_errors = {}
         c.form_result = {}
         c.agency = Agency()
         return render('/settings/edit.mako')
 
     @checkRole('admin_ka')
-    def editSettingsAction(self):
+    def editAction(self):
         validator = EditSettingsForm()
         c.agency = Agency()
         try: