[Mpuls-commits] r4881 - in base/trunk: . mpulsweb/templates/administration

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-04-06 17:27:25 +0200 (Wed, 06 Apr 2011)
New Revision: 4881

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/administration/new_user.mako
   base/trunk/mpulsweb/templates/administration/new_user_result.mako
Log:
Issue1929: Show correct rolenames when creating new users.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-04-06 15:25:19 UTC (rev 4880)
+++ base/trunk/ChangeLog	2011-04-06 15:27:25 UTC (rev 4881)
@@ -13,6 +13,9 @@
 	"button" now looks even more like regular formular-buttons.
 	* mpulsweb/public/styles/screen.css: Fixed layout of pages in case the
 	header is displayed in two lines.
+	* mpulsweb/templates/administration/new_user_result.mako,
+	mpulsweb/templates/administration/new_user.mako: Issue1929: Show
+	correct rolenames when creating new users.
 
 2011-04-05  Torsten Irlaender <torsten at intevation.de>
 

Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako	2011-04-06 15:25:19 UTC (rev 4880)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako	2011-04-06 15:27:25 UTC (rev 4881)
@@ -101,9 +101,9 @@
           <label for="role">${_('User role')}</label><br>
           <select name="role" id="role">
             % if h.getLogin() != 'adm':
-              <option value="CM" >${_('role_user')}</option>
+              <option value="cm" >${_('role_user')}</option>
             % endif
-            <option value="Admin">${_('role_admin')}</option>
+            <option value="admin">${_('role_admin')}</option>
           </select>
         </div>
         <div class="w100">

Modified: base/trunk/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user_result.mako	2011-04-06 15:25:19 UTC (rev 4880)
+++ base/trunk/mpulsweb/templates/administration/new_user_result.mako	2011-04-06 15:27:25 UTC (rev 4881)
@@ -55,7 +55,7 @@
   </tr>
   <tr>
     <td class="label table_header_v">${_('Role')}</td>
-    <td class="table_row_v table_description">${c.uo.role| F.NA}</td>
+    <td class="table_row_v table_description">${c.uo.getRole()| F.NA}</td>
   </tr>
   <tr>
     <td class="label">${_('Activated')}</td>