[Mpuls-commits] r2286 - in wasko/branches/2.0: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-04-08 16:43:19 +0200 (Thu, 08 Apr 2010)
New Revision: 2286

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/controllers/formularpage.py
Log:
* mpulsweb/controllers/formularpage.py (get_rendered_page): Do not
show errors on a repeat group overview page (i.e. when rendering
an intance of RepeatInstanceContainerNode).  The links generated
for the errors would refer to field that are not shown on the page
because they would be on the pages of the repeat group instances.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-08 13:15:04 UTC (rev 2285)
+++ wasko/branches/2.0/ChangeLog	2010-04-08 14:43:19 UTC (rev 2286)
@@ -1,3 +1,11 @@
+2010-04-08  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/controllers/formularpage.py (get_rendered_page): Do not
+	show errors on a repeat group overview page (i.e. when rendering
+	an intance of RepeatInstanceContainerNode).  The links generated
+	for the errors would refer to field that are not shown on the page
+	because they would be on the pages of the repeat group instances.
+
 2010-04-07  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* /home/torsten/Projekte/mpuls/wasko/src/2.0/mpulsweb/lib/config.py:

Modified: wasko/branches/2.0/mpulsweb/controllers/formularpage.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/formularpage.py	2010-04-08 13:15:04 UTC (rev 2285)
+++ wasko/branches/2.0/mpulsweb/controllers/formularpage.py	2010-04-08 14:43:19 UTC (rev 2286)
@@ -74,8 +74,6 @@
     log.debug('Getting page "%s"' % id)
     page = instance_tree.getItem(id)
 
-    errors, defaults = convert_error_items(page.getErrors())
-
     if page:
         c.formularheader = ("<h1>%s</h1>"
                             % escape(page.getMeta().getDescription()))
@@ -85,10 +83,13 @@
                                                        'ro') == 'ro',
                                            g.mpuls_config.get("renderer",
                                                               "rg_digests"))
+            errors = {}
+            defaults = {}
         else:
             c.formularerrors = u"Fehler"
             renderer = ViewRenderer(instance_tree, page,
                                     session.get('render_mode', 'ro') == 'ro')
+            errors, defaults = convert_error_items(page.getErrors())
         try:
             mark_folderopen(session['navigation.tree'].getTreeItem(id))
             if session['navigation.tree'].getTreeItem(id).nextKey():