merge 3.5
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Tue, 15 Sep 2009 16:02:07 +0200
branch3.5
changeset 3233 7ac07c3a9659
parent 3223 480b003cd31b (diff)
parent 3229 948e0cb59b1a (current diff)
child 3234 e454590f1b80
merge
--- a/web/views/treeview.py	Tue Sep 15 14:49:40 2009 +0200
+++ b/web/views/treeview.py	Tue Sep 15 16:02:07 2009 +0200
@@ -24,7 +24,7 @@
     css_classes = 'treeview widget'
     title = _('tree view')
 
-    def call(self, subvid=None, treeid=None, initial_load=True):
+    def call(self, subvid=None, treeid=None, initial_load=True, initial_thru_ajax=False):
         if subvid is None:
             subvid = self.req.form.pop('treesubvid', 'oneline') # consume it
         if treeid is None:
@@ -32,7 +32,7 @@
             if treeid is None:
                 self.warning('Tree state won\'t be properly restored after next reload')
                 treeid = make_uid('throw away uid')
-        toplevel_thru_ajax = self.req.form.pop('treeview_top', False)
+        toplevel_thru_ajax = self.req.form.pop('treeview_top', False) or initial_thru_ajax
         toplevel = toplevel_thru_ajax or (initial_load and not self.req.form.get('fname'))
         ulid = ' '
         if toplevel: