web/facet.py
branchstable
changeset 7879 9aae456abab5
parent 7874 be04706eacc9
child 7943 ad0581296e2c
child 7944 1faa8edb5ae3
--- a/web/facet.py	Tue Sep 27 16:04:30 2011 +0200
+++ b/web/facet.py	Wed Sep 28 09:27:42 2011 +0200
@@ -82,9 +82,9 @@
 
 @deprecated('[3.13] filter_hiddens moved to cubicweb.web.views.facets with '
             'slightly modified prototype')
-def filter_hiddens(w, **kwargs):
+def filter_hiddens(w, baserql, **kwargs):
     from cubicweb.web.views.facets import filter_hiddens
-    return filter_hiddens(w, wdgs=kwargs.pop('facets'))
+    return filter_hiddens(w, baserql, wdgs=kwargs.pop('facets'), **kwargs)
 
 
 ## rqlst manipulation functions used by facets ################################
@@ -502,7 +502,7 @@
 
 class RelationFacet(VocabularyFacet):
     """Base facet to filter some entities according to other entities to which
-    they are related. Create concret facet by inheriting from this class an then
+    they are related. Create concrete facet by inheriting from this class an then
     configuring it by setting class attribute described below.
 
     The relation is defined by the `rtype` and `role` attributes.
@@ -751,7 +751,7 @@
                 restrvar, rtrel = _make_relation(self.select, self.filtered_variable,
                                                  self.rtype, self.role)
                 if rel is None:
-                    select.add_restriction(rtrel)
+                    self.select.add_restriction(rtrel)
                 else:
                     rel.parent.replace(rel, nodes.And(rel, rtrel))
                 self._and_restriction(rel, restrvar, value.pop())