[Mpuls-commits] r4750 - in base/trunk: . mpulsweb/model mpulsweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-03-03 12:45:44 +0100 (Thu, 03 Mar 2011)
New Revision: 4750

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/model/case.py
   base/trunk/mpulsweb/templates/casemanagement/digest.mako
Log:
Issue1867: Fixed display of maxSaveTime


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-03-03 09:17:19 UTC (rev 4749)
+++ base/trunk/ChangeLog	2011-03-03 11:45:44 UTC (rev 4750)
@@ -1,3 +1,10 @@
+2011-03-03  Torsten Irlaender <torsten at intevation.de>
+
+	* mpulsweb/templates/casemanagement/digest.mako: Show reminder if days
+	to MaxSaveTime is <= 0
+	* mpulsweb/model/case.py (MpulsCaseState.daysToMaxSavetime): Fixed
+	returning daysToMaxSavetime.
+
 2011-03-02  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* mpulsweb/i18n/mpulsweb.pot

Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py	2011-03-03 09:17:19 UTC (rev 4749)
+++ base/trunk/mpulsweb/model/case.py	2011-03-03 11:45:44 UTC (rev 4750)
@@ -1397,8 +1397,7 @@
             age = datetime.now() - self.getLastDate()
 
         if self.check_remindcondition():
-            if int(maxage) != 0:
-                return int(maxage) - age.days
+            return int(maxage) - age.days
         else:
             return 15 # showning counting days until generation of a reminder
                       # starts 14 days before maxsavetime is reached in

Modified: base/trunk/mpulsweb/templates/casemanagement/digest.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest.mako	2011-03-03 09:17:19 UTC (rev 4749)
+++ base/trunk/mpulsweb/templates/casemanagement/digest.mako	2011-03-03 11:45:44 UTC (rev 4750)
@@ -58,7 +58,7 @@
     ${self.buildModusfield()}
   </div>
   % if not c.print_version:
-    % if c.daysToMaxSavetime < 0:
+    % if c.daysToMaxSavetime <= 0:
       <div class="dialog">
         % if c.finished:
           <h1>