[Mpuls-commits] r359 - in wasko/trunk: . waskaweb/templates/appointments waskaweb/templates/casemanagement waskaweb/templates/start

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-03-11 11:44:50 +0100 (Wed, 11 Mar 2009)
New Revision: 359

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/templates/appointments/edit_body.mako
   wasko/trunk/waskaweb/templates/casemanagement/showAppointment.mako
   wasko/trunk/waskaweb/templates/start/start.mako
Log:
Fixed issue 93,94


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-11 09:45:38 UTC (rev 358)
+++ wasko/trunk/ChangeLog.txt	2009-03-11 10:44:50 UTC (rev 359)
@@ -11,6 +11,14 @@
 	  formed/formedtree_web.xml: Six more static fields under "5.2.1.5
 	  Erfassung von Fehlzeiten"
 
+	Fixed issue94, Fixed issue93
+
+	* waskaweb/templates/appointments/edit_body.mako,
+	  waskaweb/templates/start/start.mako,
+	  waskaweb/templates/casemanagement/showAppointment.mako:
+	  Caseappointmnts are now shown on the blackboard again. Furter the
+	  creation of reminders was fixed.
+
 2009-03-10	Sascha L. Teichmann	<teichmann at intevation.de>
 
 	* waskaweb/lib/xmlhelper.py: Replaced usage of datetime.strptime() 

Modified: wasko/trunk/waskaweb/templates/appointments/edit_body.mako
===================================================================
--- wasko/trunk/waskaweb/templates/appointments/edit_body.mako	2009-03-11 09:45:38 UTC (rev 358)
+++ wasko/trunk/waskaweb/templates/appointments/edit_body.mako	2009-03-11 10:44:50 UTC (rev 359)
@@ -41,7 +41,7 @@
 </fieldset>
 <fieldset>
   <legend>${_('app_form_legend_appdate')}</legend>
-  % if h.hasRole('cm_ka'):
+  % if h.hasRole(['cm_ka']):
   <div class="w100">
     % if c.form_errors.get('type'):
       <label for="type" class="error_font">${_('app_form_type')}</label><br>

Modified: wasko/trunk/waskaweb/templates/casemanagement/showAppointment.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/showAppointment.mako	2009-03-11 09:45:38 UTC (rev 358)
+++ wasko/trunk/waskaweb/templates/casemanagement/showAppointment.mako	2009-03-11 10:44:50 UTC (rev 359)
@@ -12,7 +12,7 @@
   <div id="modusfield">
     <div class="actions">
       <ul>
-        % if h.hasRole('cm_ka'):
+        % if h.hasRole(['cm_ka']):
         <li>
           <a href="${h.url_for(controller='/case', action='editAppointment', id=c.appointment.id)}">
             ${_('sm_menu_link_edit_appointment')}

Modified: wasko/trunk/waskaweb/templates/start/start.mako
===================================================================
--- wasko/trunk/waskaweb/templates/start/start.mako	2009-03-11 09:45:38 UTC (rev 358)
+++ wasko/trunk/waskaweb/templates/start/start.mako	2009-03-11 10:44:50 UTC (rev 359)
@@ -36,14 +36,14 @@
       </div>
     %endif
     %if c.news.getList():
-    <div class="news">
-      <h2>Aktuelle Hinweise</h2>
-      <%include file="/start/newslist.mako"/>
-    </div>
+      <div class="news">
+        <h2>Aktuelle Hinweise</h2>
+        <%include file="/start/newslist.mako"/>
+      </div>
     % endif
-    ## <h2>Automatisierte Wiedervorlagen</h2>
-    ## <%include file="/start/remindlist.mako"/>
-    %if h.hasRole('cm_ka'):
+    <h2>Automatisierte Wiedervorlagen</h2>
+    <%include file="/start/remindlist.mako"/>
+    %if h.hasRole(['cm_ka']):
       <h2>Eigene Termine</h2>
       <%include file="/start/appointmentlist.mako"/>
     % endif