[Mpuls-commits] r5896 - in base/trunk/mpulsweb: controllers templates/administration/dialogs

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-09 11:53:44 +0100 (Fri, 09 Mar 2012)
New Revision: 5896

Modified:
   base/trunk/mpulsweb/controllers/administration.py
   base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
Log:
Issue 2945: Short the navpath of confirm_deleteuser.
Bugfix: Set the id to delete_user_id in the controller.
This var is needed by the navpath



Modified: base/trunk/mpulsweb/controllers/administration.py
===================================================================
--- base/trunk/mpulsweb/controllers/administration.py	2012-03-09 10:19:23 UTC (rev 5895)
+++ base/trunk/mpulsweb/controllers/administration.py	2012-03-09 10:53:44 UTC (rev 5896)
@@ -269,6 +269,7 @@
                               'success_delete_user.mako')
 
         else:
+            c.delete_user_id = id
             c.context = "../main.mako"
             c.confirm_for = _('Delete user?')
             c.question = _('Please confirm to delete user '

Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako	2012-03-09 10:19:23 UTC (rev 5895)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako	2012-03-09 10:53:44 UTC (rev 5896)
@@ -4,9 +4,6 @@
 	${parent.buildNavipath()}
 	<li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
 	<li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
-	<li><a href="#">${_('Delete user?')}</a></li>
-        <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
-        <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>i
-        <li><a href="#">${_('User deleted!')}</a></li>
+        <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id, confirmed='1')}">${_('Delete helper user')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />