cubicweb: comparison web/facet.py

equal deleted inserted replaced

-:c7c4775a5619
+:7b88d12b4ee2
 term = nodes.SortTerm(sortfunc, sortasc)
 rqlst.add_sort_term(term)
 def insert_attr_select_relation(rqlst, mainvar, rtype, role, attrname,
 sortfuncname=None, sortasc=True):
-"""modify a syntax tree to retrieve only relevant attribute `attr` of `var`"""
+"""modify a syntax tree to :
+* link a new variable to `mainvar` through `rtype` (where mainvar has `role`)
+* retrieve only the newly inserted variable and its `attrname`
+Sorting:
+* on `attrname` ascendant (`sortasc`=True) or descendant (`sortasc`=False)
+* on `sortfuncname`(`attrname`) if `sortfuncname` is specified
+* no sort if `sortasc` is None
+"""
 _cleanup_rqlst(rqlst, mainvar)
 var = _prepare_vocabulary_rqlst(rqlst, mainvar, rtype, role)
 # not found, create one
 attrvar = rqlst.make_variable()
 rqlst.add_relation(var, attrname, attrvar)
 # if query is grouped, we have to add the attribute variable
 if rqlst.groupby:
 if not attrvar in rqlst.groupby:
 rqlst.add_group_var(attrvar)
-_set_orderby(rqlst, attrvar, sortasc, sortfuncname)
+if sortasc is not None:
+_set_orderby(rqlst, attrvar, sortasc, sortfuncname)
 # add attribute variable to selection
 rqlst.add_selected(attrvar)
 # add is restriction if necessary
 if not mainvar.stinfo['typerels']:
 etypes = frozenset(sol[mainvar.name] for sol in rqlst.solutions)
 # set this to a stored procedure name if you want to sort on the result of
 # this function's result instead of direct value
 sortfunc = None
 # ascendant/descendant sorting
 sortasc = True
+# if you want to call a view on the entity instead of using `target_attr`
+label_vid = None
 @property
 def title(self):
 return display_name(self.req, self.rtype, form=self.role)
 def vocabulary(self):
 """return vocabulary for this facet, eg a list of 2-uple (label, value)
 """
 rqlst = self.rqlst
 rqlst.save_state()
+if self.label_vid is not None and self.sortfunc is None:
+sort = None # will be sorted on label
+else:
+sort = self.sortasc
 try:
 mainvar = self.filtered_variable
 insert_attr_select_relation(rqlst, mainvar, self.rtype, self.role,
-self.target_attr, self.sortfunc, self.sortasc)
+self.target_attr, self.sortfunc, sort)
 try:
 rset = self.rqlexec(rqlst.as_string(), self.rset.args, self.rset.cachekey)
 except:
 self.exception('error while getting vocabulary for %s, rql: %s',
 self, rqlst.as_string())
 return [str(x) for x, in self.rqlexec(rqlst.as_string())]
 finally:
 rqlst.recover()
 def rset_vocabulary(self, rset):
-_ = self.req._
+if self.label_vid is None:
-return [(_(label), eid) for eid, label in rset]
+_ = self.req._
+return [(_(label), eid) for eid, label in rset]
+if self.sortfunc is None:
+return sorted((entity.view(self.label_vid), entity.eid)
+for entity in rset.entities())
+return [(entity.view(self.label_vid), entity.eid)
+for entity in rset.entities()]
 @cached
 def support_and(self):
 rschema = self.schema.rschema(self.rtype)
 if self.role == 'subject':
 self.rqlst.add_constant_restriction(self.filtered_variable,
 self.rtype,
 self.formatvalue(supvalue),
 self.attrtype, '<=')
 class DateRangeFacet(RangeFacet):
 attrtype = 'Date' # only date types are supported
 @property
 def wdgclass(self):
 var = self.rqlst.make_variable()
 if self.role == 'subject':
 self.rqlst.add_relation(self.filtered_variable, self.rtype, var)
 else:
 self.rqlst.add_relation(var, self.rtype, self.filtered_variable)
 ## html widets ################################################################
 class FacetVocabularyWidget(HTMLWidget):
 def _render(self):
 facet = self.facet
 facet.req.add_js('ui.slider.js')
 facet.req.add_css('ui.all.css')
-sliderid = make_uid('the slider')
+sliderid = make_uid('theslider')
 facetid = xml_escape(self.facet.id)
 facet.req.html_headers.add_onload(self.onload % {
 'sliderid': sliderid,
 'facetid': facetid,
 'minvalue': self.minvalue,
 % (cssclass, xml_escape(unicode(self.value))))
 self.w(u'<img src="%s" alt="%s"/>&#160;' % (imgsrc, imgalt))
 self.w(u'<a href="javascript: {}">%s</a>' % xml_escape(self.label))
 self.w(u'</div>')
 class CheckBoxFacetWidget(HTMLWidget):
 selected_img = "black-check.png"
 unselected_img = "black-uncheck.png"
 def __init__(self, req, facet, value, selected):
 self.w(u'<label class="facetTitle" cubicweb:facetName="%s"><a href="javascript: {}">%s</a></label>' % (facetid, title))
 self.w(u'</div>\n')
 self.w(u'</div>\n')
 self.w(u'</div>\n')
 class FacetSeparator(HTMLWidget):
 def __init__(self, label=None):
 self.label = label or u'&#160;'
 def _render(self):

changeset 3369	7b88d12b4ee2
parent 3023	7864fee8b4ec
parent 3333	c61a526b530e
child 3451	6b46d73823f5