# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1305188537 -7200
# Node ID 3c9850d929e518effc96fb7264ba35da11f94ffe
# Parent  e5e6ef56cfb50715b25699a6584b4e788a305b6c
[web request] don't define pageid js variable when one is found in form parameters (eg, page ajax call)

diff -r e5e6ef56cfb5 -r 3c9850d929e5 web/data/cubicweb.ajax.js
--- a/web/data/cubicweb.ajax.js	Wed May 11 19:03:16 2011 +0200
+++ b/web/data/cubicweb.ajax.js	Thu May 12 10:22:17 2011 +0200
@@ -1,4 +1,4 @@
-/* copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+/* copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
  * contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
  *
  * This file is part of CubicWeb.
diff -r e5e6ef56cfb5 -r 3c9850d929e5 web/request.py
--- a/web/request.py	Wed May 11 19:03:16 2011 +0200
+++ b/web/request.py	Thu May 12 10:22:17 2011 +0200
@@ -116,8 +116,8 @@
         pid = self.form.get('pageid')
         if pid is None:
             pid = make_uid(id(self))
+            self.html_headers.define_var('pageid', pid, override=False)
         self.pageid = pid
-        self.html_headers.define_var('pageid', pid, override=False)
 
     @property
     def authmode(self):
diff -r e5e6ef56cfb5 -r 3c9850d929e5 web/views/basecontrollers.py
--- a/web/views/basecontrollers.py	Wed May 11 19:03:16 2011 +0200
+++ b/web/views/basecontrollers.py	Thu May 12 10:22:17 2011 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.