[Mpuls-commits] r527 - in wasko/trunk: . waskaweb/controllers waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-06-16 11:28:45 +0200 (Tue, 16 Jun 2009)
New Revision: 527

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/controllers/case.py
   wasko/trunk/waskaweb/templates/casemanagement/main.mako
Log:
Fixed issue242


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-06-16 07:43:43 UTC (rev 526)
+++ wasko/trunk/ChangeLog.txt	2009-06-16 09:28:45 UTC (rev 527)
@@ -1,3 +1,11 @@
+2009-06-16	Torsten Irlaender  <torsten.irlaender at intevation.de> 
+
+	Fixed issue242
+
+	* waskaweb/controllers/case.py,
+	  waskaweb/templates/casemanagement/main.mako: Admin can not view the
+	  logbook anymore. 
+
 2009-06-12	Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
 	Tagged as 1.0.2

Modified: wasko/trunk/waskaweb/controllers/case.py
===================================================================
--- wasko/trunk/waskaweb/controllers/case.py	2009-06-16 07:43:43 UTC (rev 526)
+++ wasko/trunk/waskaweb/controllers/case.py	2009-06-16 09:28:45 UTC (rev 527)
@@ -713,7 +713,7 @@
         c.appointmentlist  = CaseAppointmentOverview(id)
         return render('/casemanagement/appointments.mako')
 
-    @checkRole(('admin_ka', 'cm_ka'))
+    @checkRole(('cm_ka'))
     def printLogbook(self, id):
         id                 = self._checkInt(id)
         case               = self._loadCase(id)
@@ -728,7 +728,7 @@
         # c.eval_effort = logbook.getEvaluation()
         return render('/logbook/overview_print.mako')
 
-    @checkRole(('admin_ka', 'cm_ka'))
+    @checkRole(('cm_ka'))
     def logbook(self, id, sort_field='datum', sort_order='desc'):
         id                 = self._checkInt(id)
         case               = self._loadCase(id)
@@ -909,7 +909,7 @@
             c.url_ok = "/case/logbook/%s" % str(session['case'].id)
             return render('/logbook/dialogs/failed_create_logbook_entry.mako')
 
-    @checkRole(('cm_ka', 'admin_ka'))
+    @checkRole(('cm_ka'))
     def showLogbookEntry(self, id):
         id = self._checkInt(id)
         try:

Modified: wasko/trunk/waskaweb/templates/casemanagement/main.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/main.mako	2009-06-16 07:43:43 UTC (rev 526)
+++ wasko/trunk/waskaweb/templates/casemanagement/main.mako	2009-06-16 09:28:45 UTC (rev 527)
@@ -74,7 +74,9 @@
         <li><a href="/caselifetime/index/${session.get('case').id}" onclick="return checkModification();"> ${_('Verwaltung')}</a></li>
         <li><a href="/case/organisation/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_organisation')}</a></li>
         <li><a href="/case/appointments/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_appointment')}</a></li>
-        <li><a href="/case/logbook/${session.get('case').id}" onclick="return checkModification();"> Tagebuch</a></li>
+        % if h.hasRole(['cm_ka']):
+          <li><a href="/case/logbook/${session.get('case').id}" onclick="return checkModification();"> Tagebuch</a></li>
+        % endif
         <li><a href="/case/documents/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_documents')}</a></li>
         % endif
       </ul>