[Mpuls-commits] r5521 - in base/trunk/mpulsweb: model templates/settings

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-11-02 15:11:33 +0100 (Wed, 02 Nov 2011)
New Revision: 5521

Modified:
   base/trunk/mpulsweb/model/appointment.py
   base/trunk/mpulsweb/model/case.py
   base/trunk/mpulsweb/templates/settings/edit.mako
   base/trunk/mpulsweb/templates/settings/show.mako
Log:
User new methods im model/agencysettings to get the reminder condition and condition description


Modified: base/trunk/mpulsweb/model/appointment.py
===================================================================
--- base/trunk/mpulsweb/model/appointment.py	2011-11-02 14:09:41 UTC (rev 5520)
+++ base/trunk/mpulsweb/model/appointment.py	2011-11-02 14:11:33 UTC (rev 5521)
@@ -638,7 +638,7 @@
     def getOldAndFinishedCases(self, days, user):
         conn, cur = None, None
         list = {}
-        remindercondition = g.mpuls_config.get('case', 'remindercondition') 
+        remindercondition = Agency().getReminderCondition()
         try:
             conn = db.getConnection()
             cur = conn.cursor()
@@ -662,7 +662,7 @@
     def getOldAndActiveCases(self, days, user):
         conn, cur = None, None
         list = {}
-        remindercondition = g.mpuls_config.get('case', 'remindercondition') 
+        remindercondition = Agency().getReminderCondition()
         try:
             conn = db.getConnection()
             cur = conn.cursor()

Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py	2011-11-02 14:09:41 UTC (rev 5520)
+++ base/trunk/mpulsweb/model/case.py	2011-11-02 14:11:33 UTC (rev 5521)
@@ -1428,7 +1428,7 @@
 
     def check_remindcondition(self):
         conn, cur = None, None
-        remindercondition = g.mpuls_config.get('case', 'remindercondition')
+        remindercondition = Agency().getReminderCondition()
         try:
             try:
                 conn = db.getConnection()

Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2011-11-02 14:09:41 UTC (rev 5520)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2011-11-02 14:11:33 UTC (rev 5521)
@@ -65,7 +65,7 @@
           </label>
           <input type="text" id="max_speicherdauer" name="max_speicherdauer" value="" maxlength="4">
           <p class="info">
-            ${_('Automatic reminders are used to identify cases, which has not been edited for longer than the specified value. Additionally there can be further conditions when a reminder is created. Further condition: %s') % g.mpuls_config.get('case', 'reminderconditiondesc')}
+            ${_('Automatic reminders are used to identify cases, which has not been edited for longer than the specified value. Additionally there can be further conditions when a reminder is created. Further condition: %s') % c.agency.getReminderConditionDesc()}
           </p>
         </div>
         <div class="waska_form_element w100">

Modified: base/trunk/mpulsweb/templates/settings/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/show.mako	2011-11-02 14:09:41 UTC (rev 5520)
+++ base/trunk/mpulsweb/templates/settings/show.mako	2011-11-02 14:11:33 UTC (rev 5521)
@@ -54,7 +54,7 @@
   </tr>
   <tr>
     <td class="label table_header_v">${_('additional conditions for reminders')}</td>
-    <td class="table_row_v">${h.literal(g.mpuls_config.get('case', 'reminderconditiondesc'))}</td>
+    <td class="table_row_v">${h.literal(c.agency.getReminderConditionDesc())}</td>
   </tr>
   <tr>
     <td class="label table_header">${_('Assign case document')}</td>