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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-09 15:28:33 +0100 (Tue, 09 Feb 2010)
New Revision: 1392

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


Modified: wasko/branches/2.0/waskaweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-09 14:27:05 UTC (rev 1391)
+++ wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-09 14:28:33 UTC (rev 1392)
@@ -69,19 +69,6 @@
 DELETE_USER_SUCCESS_HEADER = _('adm_delete_user_success_header')
 DELETE_USER_SUCCESS_TEXT = _('adm_delete_user_success_text')
 
-NEW_USERGROUP_SUCCESS_HEADER = _('adm_new_usergroup_success_header')
-NEW_USERGROUP_SUCCESS_TEXT = _('adm_new_usergroup_success_text')
-NEW_USERGROUP_FAILURE_HEADER = _('adm_new_usergroup_failure_header')
-NEW_USERGROUP_FAILURE_TEXT = _('adm_new_usergroup_failure_text')
-EDIT_USERGROUP_SUCCESS_HEADER = _('adm_edit_usergroup_header')
-EDIT_USERGROUP_SUCCESS_TEXT = _('adm_edit_usergroup_text')
-DELETE_USERGROUP_CONFIRM = _('adm_delete_usergroup_confirm_header')
-DELETE_USERGROUP_CONFIRM_QUESTION = _('adm_delete_usergroup_confirm_text')
-DELETE_USERGROUP_SUCCESS_HEADER = _('adm_delete_usergroup_success_header')
-DELETE_USERGROUP_SUCCESS_TEXT = _('adm_delete_usergroup_success_text')
-DELETE_USERGROUP_FAILED_HEADER = _('adm_delete_usergroup_failure_header')
-DELETE_USERGROUP_FAILED_TEXT = _('adm_delete_usergroup_failure_text')
-
 DELETE_USER_CONFIRM = _('adm_delete_user_confirm_header')
 DELETE_USER_CONFIRM_QUESTION = _('adm_delete_user_confirm_text')
 
@@ -208,33 +195,6 @@
             #return "Es ist ein Fehler beim Speichern des Benutzers aufgetreten."
 
     @checkRole('admin_ka')
-    def deleteUserGroup(self, id, confirmed='0'):
-        id = self._checkInt(id)
-        confirmed = self._checkBool(confirmed)
-        factory = UserGroupFactory()
-        try:
-            ugo = factory.load(id)
-            if confirmed:
-                ugo.delete()
-                c.success_for = DELETE_USERGROUP_SUCCESS_HEADER
-                c.success_text = DELETE_USERGROUP_SUCCESS_TEXT
-                c.url_ok = "/administration/overviewUserGroups"
-                return render('/administration/dialogs/success_deletegroup_user.mako')
-            else:
-                c.context = "../main.mako"
-                c.confirm_for = DELETE_USERGROUP_CONFIRM
-                c.question = DELETE_USERGROUP_CONFIRM_QUESTION
-                c.url_yes = "/administration/deleteUserGroup/%s/1" % ugo.id
-                c.url_no = "/administration/overviewUserGroups/"
-                return render('/administration/dialogs/confirm_deleteusergroup.mako')
-        except:
-            return render('tests/trace.mako')
-            c.failed_for = DELETE_USERGROUP_FAILED_HEADER
-            c.failed_text = DELETE_USERGROUP_FAILED_TEXT
-            c.url_ok = "/administration/overviewUserGroups"
-            return render('/administration/dialogs/failed_new_usergroup.mako')
-
-    @checkRole('admin_ka')
     def deleteUser(self, id, confirmed='0'):
         id = self._checkInt(id)
         confirmed = self._checkBool(confirmed)