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

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-10-07 12:59:23 +0200 (Fri, 07 Oct 2011)
New Revision: 5422

Modified:
   base/trunk/mpulsweb/controllers/formularpage.py
Log:
Issue 1377: If after save and proceed the next key a rg, then to the rg
overview page is changed.


Modified: base/trunk/mpulsweb/controllers/formularpage.py
===================================================================
--- base/trunk/mpulsweb/controllers/formularpage.py	2011-10-07 10:47:05 UTC (rev 5421)
+++ base/trunk/mpulsweb/controllers/formularpage.py	2011-10-07 10:59:23 UTC (rev 5422)
@@ -177,7 +177,10 @@
             if ti.parent.repeat:
                 page_id = ti.parent.key
             else:
-                page_id = ti.nextKey().key
+                if ti.nextKey().parent.repeat:
+                    page_id = ti.nextKey().parent.key
+                else:
+                    page_id = ti.nextKey().key
 
         # Check consistence of case and retag
         self._check_case_validity(case_id)