diff -r d5987f75c97c -r 7ded2a1416e4 web/views/facets.py --- a/web/views/facets.py Thu Jul 02 10:36:25 2009 +0200 +++ b/web/views/facets.py Mon Jul 06 19:55:18 2009 +0200 @@ -41,6 +41,8 @@ needs_css = 'cubicweb.facets.css' needs_js = ('cubicweb.ajax.js', 'cubicweb.formfilter.js') + bkLinkBox_template = u'
%s
' + def facetargs(self): """this method returns the list of extra arguments that should be used by the facet @@ -80,18 +82,8 @@ widgets.append(wdg) if not widgets: return + self.displayBookmarkLink(rset) w = self.w - eschema = self.schema.eschema('Bookmark') - if eschema.has_perm(req, 'add'): - bk_path = 'view?rql=%s' % rset.printable_rql() - bk_title = req._('my custom search') - linkto = 'bookmarked_by:%s:subject' % self.req.user.eid - bk_add_url = self.build_url('add/Bookmark', path=bk_path, title=bk_title, __linkto=linkto) - bk_base_url = self.build_url('add/Bookmark', title=bk_title, __linkto=linkto) - w(u'
%s
' % ( - html_escape(bk_base_url), - html_escape(bk_add_url), - req._('bookmark this search'))) w(u'
' % ( divid, html_escape(dumps([divid, vid, paginate, self.facetargs()])))) w(u'
') @@ -109,6 +101,20 @@ import cubicweb cubicweb.info('after facets with rql: %s' % repr(rqlst)) + def displayBookmarkLink(self, rset): + eschema = self.schema.eschema('Bookmark') + if eschema.has_perm(self.req, 'add'): + bk_path = 'view?rql=%s' % rset.printable_rql() + bk_title = self.req._('my custom search') + linkto = 'bookmarked_by:%s:subject' % self.req.user.eid + bk_add_url = self.build_url('add/Bookmark', path=bk_path, title=bk_title, __linkto=linkto) + bk_base_url = self.build_url('add/Bookmark', title=bk_title, __linkto=linkto) + bk_link = u'%s' % ( + html_escape(bk_base_url), + html_escape(bk_add_url), + self.req._('bookmark this search')) + self.w(self.bkLinkBox_template % bk_link) + def get_facets(self, rset, mainvar): return self.vreg.possible_vobjects('facets', self.req, rset=rset, context='facetbox',