diff -r 0edb3b469eff -r afc563537d8f web/views/treeview.py
--- a/web/views/treeview.py Thu May 14 16:28:58 2009 +0200
+++ b/web/views/treeview.py Thu May 14 16:31:14 2009 +0200
@@ -1,22 +1,22 @@
"""Set of tree-building widgets, based on jQuery treeview plugin
:organization: Logilab
-:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
"""
__docformat__ = "restructuredtext en"
+from logilab.common.decorators import monkeypatch
from logilab.mtconverter import html_escape
from cubicweb.interfaces import ITree
from cubicweb.selectors import implements
from cubicweb.view import EntityView
-from cubicweb.utils import make_uid
+from cubicweb.web.views.basecontrollers import JSonController
def treecookiename(treeid):
return str('treestate-%s' % treeid)
-
class TreeView(EntityView):
id = 'treeview'
itemvid = 'treeitemview'
@@ -24,17 +24,13 @@
title = _('tree view')
def call(self, subvid=None, treeid=None, initial_load=True):
+ if subvid is None and 'subvid' in self.req.form:
+ subvid = self.req.form.pop('subvid') # consume it
if subvid is None:
- if 'subvid' in self.req.form:
- subvid = self.req.form.pop('subvid') # consume it
- else:
- subvid = 'oneline'
- if treeid is None:
- if 'treeid' in self.req.form:
- treeid = self.req.form.pop('treeid')
- else:
- treeid = make_uid('throw away uid')
- self.warning('Tree state won\'t be properly restored after next reload')
+ subvid = 'oneline'
+ if treeid is None and 'treeid' in self.req.form:
+ treeid = self.req.form.pop('treeid')
+ assert treeid is not None
if initial_load:
self.req.add_css('jquery.treeview.css')
self.req.add_js(('cubicweb.ajax.js', 'jquery.treeview.js'))
@@ -43,7 +39,7 @@
self.w(u'' % (treeid, 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)
+ vid=subvid, parentvid=self.id, treeid=treeid)
self.w(u'
')
@@ -57,8 +53,6 @@
def call(self, subvid=None, treeid=None, initial_load=True):
super(FileTreeView, self).call(treeid=treeid, subvid='filetree-oneline', initial_load=initial_load)
-
-
class FileItemInnerView(EntityView):
"""inner view used by the TreeItemView instead of oneline view
@@ -70,17 +64,18 @@
def cell_call(self, row, col):
entity = self.entity(row, col)
if ITree.is_implemented_by(entity.__class__) and not entity.is_leaf():
- self.w(u'%s
' % entity.view('oneline'))
+ self.w(u'%s
\n' % entity.view('oneline'))
else:
# XXX define specific CSS classes according to mime types
- self.w(u'%s
' % entity.view('oneline'))
+ self.w(u'%s
\n' % entity.view('oneline'))
class DefaultTreeViewItemView(EntityView):
"""default treeitem view for entities which don't implement ITree"""
id = 'treeitemview'
- def cell_call(self, row, col, vid='oneline', parentvid='treeview'):
+ def cell_call(self, row, col, vid='oneline', parentvid='treeview', treeid=None):
+ assert treeid is not None
entity = self.entity(row, col)
itemview = self.view(vid, self.rset, row=row, col=col)
if row == len(self.rset) - 1:
@@ -95,32 +90,83 @@
(each item should be expandable if it's not a tree leaf)
"""
id = 'treeitemview'
- __select__ = implements(ITree)
+ __select__ = EntityView.__select__ & implements(ITree) # XXX
- def cell_call(self, row, col, vid='oneline', parentvid='treeview'):
+ def open_state(self, eeid, treeid):
+ cookies = self.req.get_cookie()
+ treestate = cookies.get(treecookiename(treeid))
+ if treestate:
+ return str(eeid) in treestate.value.split(';')
+ return False
+
+ def cell_call(self, row, col, treeid, vid='oneline', parentvid='treeview'):
+ w = self.w
entity = self.entity(row, col)
- cssclasses = []
+ liclasses = []
is_leaf = False
- if row == len(self.rset) - 1:
- is_leaf = True
+ is_last = row == len(self.rset) - 1
+ is_open = self.open_state(entity.eid, treeid)
if not hasattr(entity, 'is_leaf') or entity.is_leaf():
- if is_leaf : cssclasses.append('last')
- self.w(u'' % u' '.join(cssclasses))
+ if is_last:
+ liclasses.append('last')
+ w(u'' % u' '.join(liclasses))
else:
rql = entity.children_rql() % {'x': entity.eid}
url = html_escape(self.build_url('json', rql=rql, vid=parentvid,
pageid=self.req.pageid,
- subvid=vid,
- noautoload=True))
- cssclasses.append('expandable')
- divclasses = ['hitarea expandable-hitarea']
- if is_leaf :
- cssclasses.append('lastExpandable')
- divclasses.append('lastExpandable-hitarea')
- self.w(u'' % (url, u' '.join(cssclasses)))
- self.w(u'
' % u' '.join(divclasses))
+ treeid=treeid,
+ fname='view',
+ subvid=vid))
+ divclasses = ['hitarea']
+ if is_open:
+ liclasses.append('collapsable')
+ divclasses.append('collapsable-hitarea')
+ else:
+ liclasses.append('expandable')
+ divclasses.append('closed-hitarea expandable-hitarea')
+ if is_last:
+ if is_open:
+ liclasses.append('lastCollapsable')
+ divclasses.append('lastCollapsable-hitarea')
+ else:
+ liclasses.append('lastExpandable')
+ divclasses.append('lastExpandable-hitarea')
+ if is_open:
+ w(u'' % u' '.join(liclasses))
+ else:
+ w(u'' % (url, u' '.join(liclasses)))
+ if is_leaf:
+ divtail = ''
+ else:
+ divtail = ''' onclick="asyncRemoteExec('node_clicked', '%s', '%s')"''' % \
+ (treeid, entity.eid)
+ w(u'' % (u' '.join(divclasses), divtail))
+
# add empty because jquery's treeview plugin checks for
# sublists presence
- self.w(u'')
+ if not is_open:
+ w(u'')
+ # the local node info
self.wview(vid, self.rset, row=row, col=col)
- self.w(u'
')
+ if is_open: # recurse if needed
+ self.wview(parentvid, self.req.execute(rql), treeid=treeid, initial_load=False)
+ w(u'')
+
+
+@monkeypatch(JSonController)
+def js_node_clicked(self, treeid, nodeeid):
+ """add/remove eid in treestate cookie"""
+ cookies = self.req.get_cookie()
+ statename = treecookiename(treeid)
+ treestate = cookies.get(statename)
+ if treestate is None:
+ cookies[statename] = nodeeid
+ self.req.set_cookie(cookies, statename)
+ else:
+ marked = set(filter(None, treestate.value.split(';')))
+ if nodeeid in marked:
+ marked.remove(nodeeid)
+ else:
+ marked.add(nodeeid)
+ cookies[statename] = ';'.join(marked)
+ self.req.set_cookie(cookies, statename)