[Mpuls-commits] r5513 - in jmd/trunk/jmdstrukturweb/templates: . appointments casemanagement

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-11-01 13:46:41 +0100 (Tue, 01 Nov 2011)
New Revision: 5513

Modified:
   jmd/trunk/jmdstrukturweb/templates/appointments/remindlist_body.mako
   jmd/trunk/jmdstrukturweb/templates/casemanagement/caselist.mako
   jmd/trunk/jmdstrukturweb/templates/main.mako
Log:
Issue 2402: Renaming of old roles.
Rename admin_ka->admin, cm_ka->cm, pb_ka->pb


Modified: jmd/trunk/jmdstrukturweb/templates/appointments/remindlist_body.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/appointments/remindlist_body.mako	2011-11-01 12:33:12 UTC (rev 5512)
+++ jmd/trunk/jmdstrukturweb/templates/appointments/remindlist_body.mako	2011-11-01 12:46:41 UTC (rev 5513)
@@ -15,7 +15,7 @@
      % if appointment.case_id is not None:
       ${self.showAppointmentActions(appointment)}
      % endif
-     % if h.hasRole(['cm_ka']) and not h.tag_appointment:
+     % if h.hasRole(['cm']) and not h.tag_appointment:
       ${self.showKeepActiveActions(appointment)}
     % endif
     </td>

Modified: jmd/trunk/jmdstrukturweb/templates/casemanagement/caselist.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/casemanagement/caselist.mako	2011-11-01 12:33:12 UTC (rev 5512)
+++ jmd/trunk/jmdstrukturweb/templates/casemanagement/caselist.mako	2011-11-01 12:46:41 UTC (rev 5513)
@@ -139,7 +139,7 @@
 </%def>
 
 <%def name="get_state_icon(case)">
-  % if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'organisation'):
+  % if h.hasRole(['cm']) and g.mpuls_config.is_enabled('case-module', 'organisation'):
     % if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
       <img src    = "${h.url_for('/images/icons/edit_editor.png')}"
            border = "0"
@@ -198,7 +198,7 @@
            width  = "22"
            height = "22"></a>
   % endif
-  % if h.hasRole(['admin_ka']):
+  % if h.hasRole(['admin']):
     % if case.getState().getState() in (3, 5):
       <a href="${h.url_for(controller='case', action='delete', id=case.id,
                            confirmed=0)}">
@@ -231,7 +231,7 @@
              width  = "22"
              height = "22"></a>
     % endif
-  % elif h.hasRole(['cm_ka']) and case.getState().getState() in (1, 2):
+  % elif h.hasRole(['cm']) and case.getState().getState() in (1, 2):
     % if g.mpuls_config.is_enabled('case-module', 'anonymize'):
       <a href="${h.url_for(controller='case', 
                            action='markForAnonymizeFromOverview', id=case.id,

Modified: jmd/trunk/jmdstrukturweb/templates/main.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/main.mako	2011-11-01 12:33:12 UTC (rev 5512)
+++ jmd/trunk/jmdstrukturweb/templates/main.mako	2011-11-01 12:46:41 UTC (rev 5513)
@@ -60,7 +60,7 @@
 
 <%def name="buildNavigation()">
   % if (h.getLogin() != 'adm'):
-    % if h.hasRole(['cm_ka', 'admin_ka']):
+    % if h.hasRole(['cm', 'admin']):
       <div class="menu">
         <div class="actions">
           <h1>${_('%s Start') % h.get_app_title()}</h1>
@@ -103,7 +103,7 @@
                 ${_('Case documents	')}
               </a>
             </li>
-            % if h.hasRole(['cm_ka']):
+            % if h.hasRole(['cm']):
               <li>
                 <a href="${h.url_for(controller='/case', action='new')}">
                   ${_('New case document')}
@@ -239,7 +239,7 @@
 <div id="main">
   <div class="left">
     <div>
-      % if h.hasRole(['cm_ka']):
+      % if h.hasRole(['cm']):
         ${self.buildPrivacyfield()}
       % endif
       ${next.buildNavigation()}