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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-10 10:54:02 +0100 (Wed, 10 Feb 2010)
New Revision: 1438

Modified:
   wasko/branches/2.0/waskaweb/controllers/administration.py
Log:
* waskaweb/controllers/administration.py
(AdministrationController.resetUserPassword):Deleted. Implemented in
mpulsweb now.


Modified: wasko/branches/2.0/waskaweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-10 09:51:42 UTC (rev 1437)
+++ wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-10 09:54:02 UTC (rev 1438)
@@ -54,9 +54,6 @@
 log = logging.getLogger(__name__)
 
 
-RESET_PASSWORD_CONFIRM = _('adm_reset_user_password')
-RESET_PASSWORD_CONFIRM_QUESTION = _('adm_reset_user_password_question')
-
 DELETE_USER_NOTIFICATION_SUCCESS = _('adm_delete_user_success_header')
 DELETE_USER_NOTIFICATION_TEXT_SUCCESS = _('adm_delete_user_success_text')
 
@@ -97,27 +94,6 @@
         return render('/administration/account_deactivated.mako')
 
     @checkRole('admin_ka')
-    def resetUserPassword(self, id=None, confirmed='0'):
-        id = self._checkInt(id)
-        confirmed = self._checkBool(confirmed)
-        c.uo = UserObject(id)
-        if confirmed:
-            try:
-                c.new_password = c.uo.resetPassword()
-                return render('/administration/reset_password.mako')
-            except:
-                return render('/tests/trace.mako')
-        else:
-            c.context = "../main.mako"
-            c.confirm_for = RESET_PASSWORD_CONFIRM
-            c.question = "%s %s, %s" % (RESET_PASSWORD_CONFIRM_QUESTION,
-                                        c.uo.last_name, c.uo.first_name)
-
-            c.url_yes = "/administration/resetUserPassword/%s/1" % id
-            c.url_no = "/administration/showUser/%s" % id
-            return render('/administration/dialogs/confirm_resetpassword.mako')
-
-    @checkRole('admin_ka')
     def editUserAction(self):
         validator = EditUserForm()
         try: