[Mpuls-commits] r4940 - in base/trunk: . mpulsweb/templates/phase

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-05-04 18:46:37 +0200 (Wed, 04 May 2011)
New Revision: 4940

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/phase/phase.mako
Log:
* mpulsweb/templates/phase/phase.mako: When listing the fields
required to end a phase, handle the case where a key in the list
'order' returned by getLinks() is not contained in the pages
dictionary. This case is handled already in the same way in the
duplicated code for the start of a phase earlier in the file.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-05-02 10:09:53 UTC (rev 4939)
+++ base/trunk/ChangeLog	2011-05-04 16:46:37 UTC (rev 4940)
@@ -1,3 +1,11 @@
+2011-05-04  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/templates/phase/phase.mako: When listing the fields
+	required to end a phase, handle the case where a key in the list
+	'order' returned by getLinks() is not contained in the pages
+	dictionary. This case is handled already in the same way in the
+	duplicated code for the start of a phase earlier in the file.
+
 2011-05-02  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/controllers/case.py: Issue2027: Use htmlfill to render page

Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako	2011-05-02 10:09:53 UTC (rev 4939)
+++ base/trunk/mpulsweb/templates/phase/phase.mako	2011-05-04 16:46:37 UTC (rev 4940)
@@ -117,7 +117,7 @@
             <% pages, order = p2.getLinks() %>
             % if len(pages) > 0:
               % for key in order:
-                <% fields = pages.get(key) %>
+                <% fields = pages.get(key, []) %>
                 % if len(fields) > 0:
                   <strong>${key}</strong>:
                   ${h.literal(", ".join([f.get_link() for f in fields]))}