# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1303997352 -7200
# Node ID de8ae247bb04b486f9d169d2010906bd91ce125f
# Parent  1d1446e9dfe28a859711fa20f79cb85986f3a3e0# Parent  2fe2ed459e4d2351e1d89f264c73346c1b5aaac4
merge oldstable

diff -r 1d1446e9dfe2 -r de8ae247bb04 utils.py
--- a/utils.py	Wed Apr 27 16:10:10 2011 +0200
+++ b/utils.py	Thu Apr 28 15:29:12 2011 +0200
@@ -230,7 +230,10 @@
     Request objects use a HTMLHead instance to ease adding of
     javascripts and stylesheets
     """
-    js_unload_code = u'jQuery(window).unload(unloadPageData);'
+    js_unload_code = u'''if (typeof(pageDataUnloaded) == 'undefined') {
+    jQuery(window).unload(unloadPageData);
+    pageDataUnloaded = true;
+}'''
     # Making <script> tag content work properly with all possible
     # content-types (xml/html) and all possible browsers is very
     # tricky, see http://www.hixie.ch/advocacy/xhtml for an in-depth discussion
diff -r 1d1446e9dfe2 -r de8ae247bb04 web/request.py
--- a/web/request.py	Wed Apr 27 16:10:10 2011 +0200
+++ b/web/request.py	Thu Apr 28 15:29:12 2011 +0200
@@ -135,12 +135,12 @@
         """
         return self.set_varmaker()
 
-    def _get_tabindex_func(self):
+    def next_tabindex(self):
         nextfunc = self.get_page_data('nexttabfunc')
         if nextfunc is None:
             nextfunc = count(1).next
             self.set_page_data('nexttabfunc', nextfunc)
-        return nextfunc
+        return nextfunc()
 
     def set_varmaker(self):
         varmaker = self.get_page_data('rql_varmaker')
@@ -154,8 +154,6 @@
         or an anonymous connection is open
         """
         super(CubicWebRequestBase, self).set_session(session, user)
-        # tabindex generator
-        self.next_tabindex = self._get_tabindex_func()
         # set request language
         vreg = self.vreg
         if self.user:
diff -r 1d1446e9dfe2 -r de8ae247bb04 web/views/startup.py
--- a/web/views/startup.py	Wed Apr 27 16:10:10 2011 +0200
+++ b/web/views/startup.py	Thu Apr 28 15:29:12 2011 +0200
@@ -125,7 +125,7 @@
     def create_links(self):
         self.w(u'<ul class="createLink">')
         for etype in self.add_etype_links:
-            eschema = self.schema.eschema(etype)
+            eschema = self._cw.vreg.schema.eschema(etype)
             if eschema.has_perm(self._cw, 'add'):
                 self.w(u'<li><a href="%s">%s</a></li>' % (
                         self._cw.build_url('add/%s' % eschema),