Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
selector update
authorsylvain.thenault@logilab.fr
Mon, 19 Jan 2009 19:46:33 +0100
changeset 445 18cc518d5e33
parent 444 c6f20e605b84
child 446 3a3ab6bbccc5
selector update
web/box.py file | annotate | diff | comparison | revisions
web/views/navigation.py file | annotate | diff | comparison | revisions 
--- a/web/box.py	Mon Jan 19 19:24:00 2009 +0100
+++ b/web/box.py	Mon Jan 19 19:46:33 2009 +0100
@@ -14,9 +14,9 @@
     accepts_registerer, extresources_registerer,
     etype_rtype_priority_registerer)
 from cubicweb.common.selectors import (
-    etype_rtype_selector, one_line_rset, accept, accept_rtype_selector,
+    etype_rtype_selector, one_line_rset, accept, has_relation,
     primary_view, match_context_prop, has_related_entities,
-    _rqlcondition_selector)
+    _rql_condition)
 from cubicweb.common.view import Template
 from cubicweb.common.appobject import ReloadableMixIn
 
@@ -152,8 +152,7 @@
     __registerer__ = accepts_registerer
     __selectors__ = (one_line_rset, primary_view,
                      match_context_prop, etype_rtype_selector,
-                     accept_rtype_selector, accept,
-                     _rqlcondition_selector)
+                     has_relation, accept, _rql_condition)
     accepts = ('Any',)
     context = 'incontext'
     condition = None
--- a/web/views/navigation.py	Mon Jan 19 19:24:00 2009 +0100
+++ b/web/views/navigation.py	Mon Jan 19 19:46:33 2009 +0100
@@ -11,9 +11,9 @@
 from logilab.mtconverter import html_escape
 
 from cubicweb.interfaces import IPrevNext
-from cubicweb.common.selectors import (paginated_rset, sortedrset_selector,
-                                    primary_view, match_context_prop,
-                                    one_line_rset, implement_interface)
+from cubicweb.common.selectors import (paginated_rset, sorted_rset,
+                                       primary_view, match_context_prop,
+                                       one_line_rset, implement_interface)
 from cubicweb.common.uilib import cut
 from cubicweb.web.component import EntityVComponent, NavigationComponent
 
@@ -49,7 +49,7 @@
     """sorted navigation apply if navigation is needed (according to page size)
     and if the result set is sorted
     """
-    __selectors__ = (paginated_rset, sortedrset_selector)
+    __selectors__ = (paginated_rset, sorted_rset)
     
     # number of considered chars to build page links
     nb_chars = 5
cubicweb