[Mpuls-commits] r1371 - wasko/branches/2.0/waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-09 14:18:09 +0100 (Tue, 09 Feb 2010)
New Revision: 1371

Modified:
   wasko/branches/2.0/waskaweb/controllers/administration.py
Log:
* waskaweb/controllers/administration.py (AdministrationController.editUserGroupAction): Deleted.


Modified: wasko/branches/2.0/waskaweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-09 13:15:54 UTC (rev 1370)
+++ wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-09 13:18:09 UTC (rev 1371)
@@ -114,40 +114,6 @@
         return render('/administration/account_deactivated.mako')
 
     @checkRole('admin_ka')
-    def editUserGroupAction(self):
-        validator = EditUserGroupForm()
-        factory = UserGroupFactory()
-        userlist = UserListObject()
-        admins = userlist.getAdminList()
-        c.userlist = userlist.getUserList(filter=[u.id for u in admins])
-        try:
-            try:
-                state = ValidatorStateObject
-                data = formencode.variabledecode.variable_decode(request.params)
-                state.groupid = data.get('id')
-                form_result = validator.to_python(data, state)
-                group = factory.load(form_result.get('id'))
-                group.setData(form_result)
-                group.setUser(form_result.get('standin'))
-                group.store()
-                c.group = group
-                c.success_for = EDIT_USERGROUP_SUCCESS_HEADER
-                c.success_text = EDIT_USERGROUP_SUCCESS_TEXT
-                c.url_ok = "/administration/overviewUserGroups"
-                return render('/administration/dialogs/success_edit_usergroup.mako')
-            except formencode.Invalid, error:
-                c.form_result = error.value
-                c.group = factory.load(c.form_result.get('id'))
-                c.form_errors = error.error_dict or {}
-                form = render('/administration/edit_usergroup.mako')
-                return htmlfill.render(unicode(form, 'utf-8'),
-                                       c.form_result,
-                                       c.form_errors,
-                                       auto_insert_errors=False)
-        except:
-            return render('/tests/trace.mako')
-
-    @checkRole('admin_ka')
     def editUser(self, id=None):
         id = self._checkInt(id)
         c.form_errors = {}