# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1239986641 -7200
# Node ID 5926626fb27b5ce6a9a5950da0593744bb9ffd3c
# Parent  3f408c7a164e678c845ea54203d994e092719aa6
fix navigation parameters handling: those given in kwargs should always be there

diff -r 3f408c7a164e -r 5926626fb27b web/form.py
--- a/web/form.py	Fri Apr 17 17:55:50 2009 +0200
+++ b/web/form.py	Fri Apr 17 18:44:01 2009 +0200
@@ -256,16 +256,20 @@
                  **kwargs):
         super(FieldsForm, self).__init__(req, rset, row=row, col=col)
         for key, val in kwargs.items():
-            assert hasattr(self.__class__, key) and not key[0] == '_', key
-            setattr(self, key, val)
+            if key in NAV_FORM_PARAMETERS:
+                self.form_add_hidden(key, val)
+            else:
+                assert hasattr(self.__class__, key) and not key[0] == '_', key
+                setattr(self, key, val)
         self.fields = list(self.__class__._fields_)
         if self.set_error_url:
             self.form_add_hidden('__errorurl', req.url())
         if self.copy_nav_params:
             for param in NAV_FORM_PARAMETERS:
-                value = kwargs.get(param, req.form.get(param))
-                if value:
-                    self.form_add_hidden(param, value)
+                if not param in kwargs:
+                    value = req.form.get(param)
+                    if value:
+                        self.form_add_hidden(param, value)
         if submitmsg is not None:
             self.form_add_hidden('__message', submitmsg)
         self.context = None