--- a/web/views/tabs.py Wed Mar 04 17:09:10 2009 +0100
+++ b/web/views/tabs.py Wed Mar 04 17:12:28 2009 +0100
@@ -32,15 +32,22 @@
});""" % {'event': 'load_%s' % vid, 'vid': vid,
'reloadable' : str(reloadable).lower()})
- def lazyview(self, vid, eid=None, reloadable=False, show_spinbox=True, w=None):
+ def lazyview(self, vid, rql=None, eid=None, rset=None, static=False,
+ reloadable=False, show_spinbox=True, w=None):
"""a lazy version of wview
first version only support lazy viewing for an entity at a time
"""
+ assert rql or eid or rset or static, \
+ 'lazyview wants at least : rql, or an eid, or an rset -- or call it with static=True'
w = w or self.w
self.req.add_js('cubicweb.lazy.js')
urlparams = {'vid' : vid, 'mode' : 'html'}
- if eid:
- urlparams['rql'] = uilib.rql_for_eid(eid)
+ if rql:
+ urlparams['rql'] = rql
+ elif eid:
+ urlparams['rql'] = rql_for_eid(eid)
+ elif rset:
+ urlparams['rql'] = rset.printable_rql()
w(u'<div id="lazy-%s" cubicweb:loadurl="%s">' % (
vid, html_escape(self.build_url('json', **urlparams))))
if show_spinbox:
@@ -64,12 +71,12 @@
return str('%s_active_tab' % self.config.appid)
def active_tab(self, tabs, default):
- cookie = self.req.get_cookie()
+ cookies = self.req.get_cookie()
cookiename = self.cookie_name
- activetab = cookie.get(cookiename)
+ activetab = cookies.get(cookiename)
if activetab is None:
- cookie[cookiename] = default
- self.req.set_cookie(cookie, cookiename)
+ cookies[cookiename] = default
+ self.req.set_cookie(cookies, cookiename)
tab = default
else:
tab = activetab.value
@@ -89,13 +96,18 @@
self.req.add_css('ui.tabs.css')
self.req.add_js(('ui.core.js', 'ui.tabs.js',
'cubicweb.ajax.js', 'cubicweb.tabs.js', 'cubicweb.lazy.js'))
+ # tabbed views do no support concatenation
+ # hence we delegate to the default tab
+ if self.req.form.get('vid') == 'primary':
+ entity.view(default)
+ return
# prune tabs : not all are to be shown
tabs = self.prune_tabs(tabs)
# select a tab
active_tab = self.active_tab(tabs, default)
# build the html structure
w = self.w
- w(u'<div id="entity-tabs">')
+ w(u'<div id="entity-tabs-%s">' % entity.eid)
w(u'<ul>')
for tab in tabs:
w(u'<li>')
@@ -109,15 +121,16 @@
w(u'</div>')
for tab in tabs:
w(u'<div id="as-%s">' % tab)
- self.lazyview(tab, entity.eid)
+ self.lazyview(tab, eid=entity.eid)
w(u'</div>')
# call the set_tab() JS function *after* each tab is generated
# because the callback binding needs to be done before
self.req.html_headers.add_onload(u"""
- jQuery('#entity-tabs > ul').tabs( { selected: %(tabindex)s });
+ jQuery('#entity-tabs-%(eeid)s > ul').tabs( { selected: %(tabindex)s });
set_tab('%(vid)s', '%(cookiename)s');
""" % {'tabindex' : tabs.index(active_tab),
'vid' : active_tab,
+ 'eeid' : entity.eid,
'cookiename' : self.cookie_name})