cubicweb: comparison web/views/treeview.py

equal deleted inserted replaced

-:f959ded4d61e
+:0dc8b2d46a53
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
 __docformat__ = "restructuredtext en"
+import simplejson as json
 from logilab.common.decorators import monkeypatch
 from logilab.mtconverter import xml_escape
 from cubicweb.utils import make_uid
 from cubicweb.interfaces import ITree
 from cubicweb.selectors import implements
 from cubicweb.view import EntityView
 return str('%s-treestate' % treeid)
 class TreeView(EntityView):
 id = 'treeview'
 itemvid = 'treeitemview'
+subvid = 'oneline'
 css_classes = 'treeview widget'
 title = _('tree view')
-def _init_params(self, subvid, treeid, initial_load, initial_thru_ajax):
+def _init_params(self, subvid, treeid, initial_load, initial_thru_ajax, morekwargs):
+form = self.req.form
 if subvid is None:
-subvid = self.req.form.pop('treesubvid', 'oneline') # consume it
+subvid = form.pop('treesubvid', self.subvid) # consume it
 if treeid is None:
-treeid = self.req.form.pop('treeid', None)
+treeid = form.pop('treeid', None)
 if treeid is None:
-self.warning('Tree state won\'t be properly restored after next reload')
+treeid = 'throw_away' + make_uid('uid')
-treeid = make_uid('throw away uid')
+if 'morekwargs' in self.req.form:
-toplevel_thru_ajax = self.req.form.pop('treeview_top', False) or initial_thru_ajax
+ajaxargs = json.loads(form.pop('morekwargs'))
-toplevel = toplevel_thru_ajax or (initial_load and not self.req.form.get('fname'))
+# got unicode & python keywords must be strings
+morekwargs.update(dict((str(k), v)
+for k, v in ajaxargs.iteritems()))
+toplevel_thru_ajax = form.pop('treeview_top', False) or initial_thru_ajax
+toplevel = toplevel_thru_ajax or (initial_load and not form.get('fname'))
 return subvid, treeid, toplevel_thru_ajax, toplevel
-def call(self, subvid=None, treeid=None, initial_load=True, initial_thru_ajax=False):
+def _init_headers(self, treeid, toplevel_thru_ajax):
+self.req.add_css('jquery.treeview.css')
+self.req.add_js(('cubicweb.ajax.js', 'cubicweb.widgets.js', 'jquery.treeview.js'))
+self.req.html_headers.add_onload(u"""
+jQuery("#tree-%s").treeview({toggle: toggleTree, prerendered: true});""" % treeid,
+jsoncall=toplevel_thru_ajax)
+def call(self, subvid=None, treeid=None,
+initial_load=True, initial_thru_ajax=False, **morekwargs):
 subvid, treeid, toplevel_thru_ajax, toplevel = self._init_params(
-subvid, treeid, initial_load, initial_thru_ajax)
+subvid, treeid, initial_load, initial_thru_ajax, morekwargs)
+print 'TREEVIEW', subvid, morekwargs
 ulid = ' '
 if toplevel:
+self._init_headers(treeid, toplevel_thru_ajax)
 ulid = ' id="tree-%s"' % treeid
 self.w(u'<ul%s class="%s">' % (ulid, self.css_classes))
 for rowidx in xrange(len(self.rset)):
 self.wview(self.itemvid, self.rset, row=rowidx, col=0,
-vid=subvid, parentvid=self.id, treeid=treeid)
+vid=subvid, parentvid=self.id, treeid=treeid, **morekwargs)
 self.w(u'</ul>')
-if toplevel:
-self.req.add_css('jquery.treeview.css')
+def cell_call(self, *args, **allargs):
-self.req.add_js(('cubicweb.ajax.js', 'cubicweb.widgets.js', 'jquery.treeview.js'))
+""" does not makes much sense until you have to invoke
-self.req.html_headers.add_onload(u"""
+somentity.view('treeview') """
-jQuery("#tree-%s").treeview({toggle: toggleTree, prerendered: true});""" % treeid,
+allargs.pop('row')
-jsoncall=toplevel_thru_ajax)
+allargs.pop('col')
+self.call(*args, **allargs)
 class FileTreeView(TreeView):
 """specific version of the treeview to display file trees
 """
 id = 'filetree'
 css_classes = 'treeview widget filetree'
 title = _('file tree view')
-def call(self, subvid=None, treeid=None, initial_load=True):
+def call(self, subvid=None, treeid=None, initial_load=True, **kwargs):
-super(FileTreeView, self).call(treeid=treeid, subvid='filetree-oneline', initial_load=initial_load)
+super(FileTreeView, self).call(treeid=treeid, subvid='filetree-oneline',
+initial_load=initial_load, **kwargs)
 class FileItemInnerView(EntityView):
 """inner view used by the TreeItemView instead of oneline view
 This view adds an enclosing <span> with some specific CSS classes
 treestate = cookies.get(treecookiename(treeid))
 if treestate:
 return str(eeid) in treestate.value.split(';')
 return self.default_branch_state_is_open
-def cell_call(self, row, col, treeid, vid='oneline', parentvid='treeview',
+def cell_call(self, row, col, treeid, vid='oneline', parentvid='treeview', **morekwargs):
-**kwargs):
 w = self.w
 entity = self.entity(row, col)
 liclasses = []
 is_last = row == len(self.rset) - 1
 is_open = self.open_state(entity.eid, treeid)
 liclasses.append('last')
 w(u'<li class="%s">' % u' '.join(liclasses))
 else:
 rql = entity.children_rql() % {'x': entity.eid}
 url = xml_escape(self.build_url('json', rql=rql, vid=parentvid,
 pageid=self.req.pageid,
 treeid=treeid,
 fname='view',
-treesubvid=vid))
+treesubvid=vid,
+morekwargs=json.dumps(morekwargs)))
 divclasses = ['hitarea']
 if is_open:
 liclasses.append('collapsable')
 divclasses.append('collapsable-hitarea')
 else:
 divclasses.append('lastExpandable-hitarea')
 if is_open:
 w(u'<li class="%s">' % u' '.join(liclasses))
 else:
 w(u'<li cubicweb:loadurl="%s" class="%s">' % (url, u' '.join(liclasses)))
-divtail = """ onclick="asyncRemoteExec('node_clicked', '%s', '%s')" """ %\
+if treeid.startswith('throw_away'):
-(treeid, entity.eid)
+divtail = ''
+else:
+divtail = """ onclick="asyncRemoteExec('node_clicked', '%s', '%s')" """ %\
+(treeid, entity.eid)
 w(u'<div class="%s"%s></div>' % (u' '.join(divclasses), divtail))
 # add empty <ul> because jquery's treeview plugin checks for
 # sublists presence
 if not is_open:
 w(u'<ul class="placeholder"><li>place holder</li></ul>')
 # the local node info
-self.wview(vid, self.rset, row=row, col=col, **kwargs)
+self.wview(vid, self.rset, row=row, col=col, **morekwargs)
 if is_open and not is_leaf: #  => rql is defined
-self.wview(parentvid, self.req.execute(rql), treeid=treeid, initial_load=False)
+self.wview(parentvid, self.req.execute(rql), treeid=treeid, initial_load=False, **morekwargs)
 w(u'</li>')

branch	stable
changeset 3320	0dc8b2d46a53
parent 3311	6934be37e948
child 3321	5baac9068823