[Mpuls-commits] r5421 - base/trunk/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-10-07 12:47:05 +0200 (Fri, 07 Oct 2011)
New Revision: 5421

Modified:
   base/trunk/mpulsweb/controllers/formularpage.py
Log:
Issue 1377: If the user edits a repeat group, the save&proceed button navs to 
the rg overview.
If a user edits a rg, the tree item parent is a repeat group container.
So then the page of this container should be used.


Modified: base/trunk/mpulsweb/controllers/formularpage.py
===================================================================
--- base/trunk/mpulsweb/controllers/formularpage.py	2011-10-07 09:27:27 UTC (rev 5420)
+++ base/trunk/mpulsweb/controllers/formularpage.py	2011-10-07 10:47:05 UTC (rev 5421)
@@ -173,7 +173,11 @@
         self._handle_repeat_group_redirects()
 
         if request.params.has_key('savenext'):
-            page_id = session['navigation.tree'].getTreeItem(page_id).nextKey().key
+            ti = session['navigation.tree'].getTreeItem(page_id)
+            if ti.parent.repeat:
+                page_id = ti.parent.key
+            else:
+                page_id = ti.nextKey().key
 
         # Check consistence of case and retag
         self._check_case_validity(case_id)