--- a/devtools/htmlparser.py Wed Feb 18 13:42:46 2009 +0100
+++ b/devtools/htmlparser.py Wed Feb 18 13:43:56 2009 +0100
@@ -6,7 +6,7 @@
from lxml import etree
from lxml.builder import E
-from cubicweb.common.view import STRICT_DOCTYPE, TRANSITIONAL_DOCTYPE, CW_XHTML_EXTENSIONS
+from cubicweb.view import STRICT_DOCTYPE, TRANSITIONAL_DOCTYPE, CW_XHTML_EXTENSIONS
STRICT_DOCTYPE = str(STRICT_DOCTYPE % CW_XHTML_EXTENSIONS).strip()
TRANSITIONAL_DOCTYPE = str(TRANSITIONAL_DOCTYPE % CW_XHTML_EXTENSIONS).strip()
--- a/sobjects/notification.py Wed Feb 18 13:42:46 2009 +0100
+++ b/sobjects/notification.py Wed Feb 18 13:43:56 2009 +0100
@@ -19,7 +19,7 @@
from logilab.common.deprecation import class_renamed
from cubicweb import RegistryException
-from cubicweb.selectors import implements
+from cubicweb.selectors import implements, yes
from cubicweb.common.view import EntityView, Component
from cubicweb.common.mail import format_mail
@@ -36,7 +36,7 @@
email addresses specified in the configuration are used
"""
id = 'recipients_finder'
- __select__ = implements('Any')
+ __select__ = yes()
user_rql = ('Any X,E,A WHERE X is EUser, X in_state S, S name "activated",'
'X primary_email E, E address A')
--- a/view.py Wed Feb 18 13:42:46 2009 +0100
+++ b/view.py Wed Feb 18 13:43:56 2009 +0100
@@ -12,7 +12,7 @@
from logilab.mtconverter import html_escape
from cubicweb import NotAnEntity, NoSelectableObject
-from cubicweb.selectors import (yes, match_user_groups, implements,
+from cubicweb.selectors import (yes, match_user_groups, non_final_entity,
nonempty_rset, none_rset)
from cubicweb.selectors import require_group_compat, accepts_compat
from cubicweb.appobject import AppRsetObject
@@ -322,7 +322,7 @@
"""
# XXX deprecate
__registerer__ = accepts_registerer
- __select__ = implements('Any')
+ __select__ = non_final_entity()
registered = accepts_compat(View.registered)
category = 'entityview'
@@ -355,7 +355,7 @@
"""base class for entity views which may also be applied to None
result set (usually a default rql is provided by the view class)
"""
- __select__ = none_rset() | implements('Any')
+ __select__ = none_rset() | non_final_entity()
default_rql = None
--- a/web/views/actions.py Wed Feb 18 13:42:46 2009 +0100
+++ b/web/views/actions.py Wed Feb 18 13:43:56 2009 +0100
@@ -129,7 +129,7 @@
# generic secondary actions ###################################################
class ManagePermissionsAction(Action):
- id = 'addpermission'
+ id = 'managepermission'
__select__ = match_user_groups('managers')
title = _('manage permissions')
--- a/web/views/baseforms.py Wed Feb 18 13:42:46 2009 +0100
+++ b/web/views/baseforms.py Wed Feb 18 13:43:56 2009 +0100
@@ -15,9 +15,9 @@
from logilab.common.decorators import cached
from cubicweb.interfaces import IWorkflowable
-from cubicweb.selectors import (specified_etype_implements,
- match_kwargs, match_form_params,
- one_line_rset, implements)
+from cubicweb.selectors import (specified_etype_implements, implements,
+ match_kwargs, match_form_params, one_line_rset,
+ non_final_entity)
from cubicweb.utils import make_uid
from cubicweb.view import EntityView
from cubicweb.common.uilib import cut
@@ -217,7 +217,7 @@
being connected
"""
id = 'edition'
- __select__ = one_line_rset() & implements('Any')
+ __select__ = one_line_rset() & non_final_entity()
title = _('edition')
controller = 'edit'
@@ -676,8 +676,7 @@
class InlineEntityEditionForm(InlineFormMixIn, EditionForm):
id = 'inline-edition'
- __select__ = (implements('Any')
- & match_kwargs('ptype', 'peid', 'rtype'))
+ __select__ = non_final_entity() & match_kwargs('ptype', 'peid', 'rtype')
EDITION_BODY = u'''\
<div onclick="restoreInlinedEntity('%(parenteid)s', '%(rtype)s', '%(eid)s')" id="div-%(parenteid)s-%(rtype)s-%(eid)s" class="inlinedform">