[Mpuls-commits] r989 - in wasko/branches/2.0: . waskaweb/controllers waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-28 17:24:02 +0100 (Thu, 28 Jan 2010)
New Revision: 989

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/case.py
   wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako
Log:
* waskaweb/controllers/case.py (CaseController.digest): Set
c.last_access to the actual datetime object, not a formatted
string.  Formatting should be done in the template.

* waskaweb/templates/casemanagement/digest_body.mako: Use
h.format_datetime to format c.last_access


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-28 16:18:31 UTC (rev 988)
+++ wasko/branches/2.0/ChangeLog	2010-01-28 16:24:02 UTC (rev 989)
@@ -1,5 +1,14 @@
 2010-01-28  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/case.py (CaseController.digest): Set
+	c.last_access to the actual datetime object, not a formatted
+	string.  Formatting should be done in the template.
+
+	* waskaweb/templates/casemanagement/digest_body.mako: Use
+	h.format_datetime to format c.last_access
+
+2010-01-28  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/casemanagement/digest_body.mako: Fix formatting.
 
 2010-01-28  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-28 16:18:31 UTC (rev 988)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-28 16:24:02 UTC (rev 989)
@@ -340,7 +340,7 @@
         case = self._loadCase(id)
         c.digest = case.getDigest()
         c.ds_id = id
-        c.last_access = case.getState().getAccessTime('%d.%m.%Y %H:%M')
+        c.last_access = case.getState().getAccessTime()
         c.daysToMaxSavetime = case.getState().daysToMaxSavetime()
         c.maxsavetime = case.getState().getMaxSavetime()
         c.finished = case.getState().isCmFinished()

Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako	2010-01-28 16:18:31 UTC (rev 988)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako	2010-01-28 16:24:02 UTC (rev 989)
@@ -76,7 +76,7 @@
       % endif
     </div>
   % else:
-    <p><strong>Letzte Bearbeitung: ${c.last_access}</strong>
+    <p><strong>Letzte Bearbeitung: ${h.format_datetime(c.last_access)}</strong>
       % if c.daysToMaxSavetime <= 14:
         % if c.finished or c.canceled:
           (Tage bis zum Überschreiten der maximalen Speicherdauer: