cubicweb: comparison web/facet.py

equal deleted inserted replaced

-:07c74f5585d1
+:bd44f506ca86
 from cubicweb import Unauthorized, typed_eid
 from cubicweb.schema import display_name
 from cubicweb.utils import make_uid
 from cubicweb.selectors import match_context_prop, partial_relation_possible
 from cubicweb.appobject import AppObject
-from cubicweb.web.htmlwidgets import HTMLWidget
+from cubicweb.web import RequestError, htmlwidgets
 def rtype_facet_title(facet):
 ptypes = facet.cw_rset.column_types(0)
 if len(ptypes) == 1:
 def operator(self):
 """Return the operator (AND or OR) to use for this facet when multiple
 values are selected.
 """
 # OR between selected values by default
-return self._cw.form.get(self.__regid__ + '_andor', 'OR')
+return self._cw.form.get(xml_escape(self.__regid__) + '_andor', 'OR')
 def rqlexec(self, rql, args=None):
 """Utility method to execute some rql queries, and simply returning an
 empty list if :exc:`Unauthorized` is raised.
 """
 DeprecationWarning)
 support = support()
 return support
 def value_restriction(self, restrvar, rel, value):
+# XXX handle rel is None case in RQLPathFacet?
 if self.restr_attr != 'eid':
 self.select.set_distinct(True)
 if isinstance(value, basestring):
 # only one value selected
 if value:
 if '' in value:
 value.remove('')
 self._add_not_rel_restr(rel)
 self._and_restriction(rel, restrvar, value)
 else:
-# multiple values with AND operator
+# multiple values with AND operator. We've to generate a query like
+# "X relation A, A eid 1, X relation B, B eid 1", hence the new
+# relations at each iteration in the while loop below
 if '' in value:
-value.remove('')
+raise RequestError("this doesn't make sense")
-self._add_not_rel_restr(rel)
 self._and_restriction(rel, restrvar, value.pop())
 while value:
 restrvar, rtrel = _make_relation(self.select, self.filtered_variable,
 self.rtype, self.role)
+if rel is None:
+select.add_restriction(rtrel)
+else:
+rel.parent.replace(rel, nodes.And(rel, rtrel))
 self._and_restriction(rel, restrvar, value.pop())
 def _and_restriction(self, rel, restrvar, value):
 if rel is None:
 self.select.add_constant_restriction(restrvar, self.restr_attr,
 self.select.add_relation(var, self.rtype, self.filtered_variable)
 ## html widets ################################################################
-class FacetVocabularyWidget(HTMLWidget):
+class FacetVocabularyWidget(htmlwidgets.HTMLWidget):
 def __init__(self, facet):
 self.facet = facet
 self.items = []
 if self.facet._support_and_compat():
 _ = self.facet._cw._
 w(u'''<select name="%s" class="radio facetOperator" title="%s">
 <option value="OR">%s</option>
 <option value="AND">%s</option>
-</select>''' % (facetid + '_andor', _('and/or between different values'),
+</select>''' % (xml_escape(self.facet.__regid__) + '_andor', _('and/or between different values'),
 _('OR'), _('AND')))
 cssclass = 'facetBody'
 if not self.facet.start_unfolded:
 cssclass += ' hidden'
 if len(self.items) > 6:
 item.render(w=w)
 w(u'</div>\n')
 w(u'</div>\n')
-class FacetStringWidget(HTMLWidget):
+class FacetStringWidget(htmlwidgets.HTMLWidget):
 def __init__(self, facet):
 self.facet = facet
 self.value = None
 def height(self):
 (xml_escape(self.facet.__regid__), title))
 w(u'<input name="%s" type="text" value="%s" />\n' % (facetid, self.value or u''))
 w(u'</div>\n')
-class FacetRangeWidget(HTMLWidget):
+class FacetRangeWidget(htmlwidgets.HTMLWidget):
 formatter = 'function (value) {return value;}'
 onload = u'''
 var _formatter = %(formatter)s;
 jQuery("#%(sliderid)s").slider({
 range: true,
 datetime2ticks(maxvalue))
 fmt = facet._cw.property_value('ui.date-format')
 facet._cw.html_headers.define_var('DATE_FMT', fmt)
-class FacetItem(HTMLWidget):
+class FacetItem(htmlwidgets.HTMLWidget):
 selected_img = "black-check.png"
 unselected_img = "no-check-no-border.png"
 def __init__(self, req, label, value, selected=False):
 w(u'<img src="%s" alt="%s"/>&#160;' % (imgsrc, imgalt))
 w(u'<a href="javascript: {}">%s</a>' % xml_escape(self.label))
 w(u'</div>')
-class CheckBoxFacetWidget(HTMLWidget):
+class CheckBoxFacetWidget(htmlwidgets.HTMLWidget):
 selected_img = "black-check.png"
 unselected_img = "black-uncheck.png"
 def __init__(self, req, facet, value, selected):
 self._cw = req
 w(u'</div>\n')
 w(u'</div>\n')
 w(u'</div>\n')
-class FacetSeparator(HTMLWidget):
+class FacetSeparator(htmlwidgets.HTMLWidget):
 def __init__(self, label=None):
 self.label = label or u'&#160;'
 def _render(self):
 pass

branch	stable
changeset 7768	bd44f506ca86
parent 7678	ab3d1a77be55
child 7849	7937cf60f2ce