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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-02 18:05:11 +0100 (Tue, 02 Feb 2010)
New Revision: 1177

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)
(CaseController.printAll): Assign the case object to c.case.  Do
not assign the digest to c anymore.

* waskaweb/templates/casemanagement/digest_body.mako: Get the
values and descriptions from the case object in c.case, not from
the digest in c.digest.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-02 16:56:03 UTC (rev 1176)
+++ wasko/branches/2.0/ChangeLog	2010-02-02 17:05:11 UTC (rev 1177)
@@ -1,5 +1,15 @@
 2010-02-02  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/case.py (CaseController.digest)
+	(CaseController.printAll): Assign the case object to c.case.  Do
+	not assign the digest to c anymore.
+
+	* waskaweb/templates/casemanagement/digest_body.mako: Get the
+	values and descriptions from the case object in c.case, not from
+	the digest in c.digest.
+
+2010-02-02  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py (Case.getDiscretionStatement)
 	(Case.getPrivacyStatement): Use case object in place of the case
 	digest object when calling the statement's fillout method.

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-02 16:56:03 UTC (rev 1176)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-02 17:05:11 UTC (rev 1177)
@@ -275,7 +275,7 @@
     def digest(self, id):
         id = self._checkInt(id)
         case = self._loadCase(id)
-        c.digest = case.getDigest()
+        c.case = case
         c.ds_id = id
         c.last_access = case.getState().getAccessTime()
         c.daysToMaxSavetime = case.getState().daysToMaxSavetime()
@@ -297,10 +297,10 @@
         c.print_version = 1
         out = []
         case = self._loadCase(id)
+        c.case = case
         render_mode = session['render_mode']
         session['render_mode'] = 'ro'
         session.save()
-        c.digest = case.getDigest()
         digest = render('/casemanagement/digest_body.mako')
         out.append(unicode(digest, 'utf-8'))
         navigation = session.get('navigation.tree')

Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako	2010-02-02 16:56:03 UTC (rev 1176)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako	2010-02-02 17:05:11 UTC (rev 1177)
@@ -94,8 +94,8 @@
 <table>
   % for num, name in enumerate(fields):
     <tr class="${num % 2 and 'hl' or ''}">
-      <td class="label">${c.digest.getDescription(name)}</td>
-      <td>${c.digest.getValue(name) | F.NA, h}</td>
+      <td class="label">${c.case.get_description(name)}</td>
+      <td>${c.case.get_value(name) | F.NA, h}</td>
     </tr>
   % endfor
 </table>