diff --git a/hooks.py b/hooks.py index 079c1fe3b1de6d50f7664d020a86c1c0d652b562_aG9va3MucHk=..f088d7cf754770e6ffc92825cf5c106cc25fadd7_aG9va3MucHk= 100644 --- a/hooks.py +++ b/hooks.py @@ -26,8 +26,8 @@ def cell_call(self, row, col=0, **kwargs): self.row, self.col = row, col try: - view = self.vreg.select_view('fullthreadtext', self.req, self.rset, - row=row, col=col) + view = self.vreg['fullthreadtext'].select(self.req, self.rset, + row=row, col=col) except RegistryException: return return view.render(row=row, col=col, w=self.w, **kwargs) diff --git a/views.py b/views.py index 079c1fe3b1de6d50f7664d020a86c1c0d652b562_dmlld3MucHk=..f088d7cf754770e6ffc92825cf5c106cc25fadd7_dmlld3MucHk= 100644 --- a/views.py +++ b/views.py @@ -98,10 +98,9 @@ self.req.add_js('cubicweb.ajax.js') self.req.add_css('cubes.comment.css') entity = self.entity(row, col) - action = self.vreg.select_action('reply_comment', self.req, self.rset, - row=row) - editaction = self.vreg.select_action('edit_comment', self.req, self.rset, - row=row) + actions = self.vreg['actions'] + action = actions.select_object('interesting', self.req, self.rset, row=row) + editaction = actions.select_object('edit_comment', self.req, self.rset, row=row) if action is None: reply = u'' else: @@ -175,11 +174,11 @@ buttons = [Button(onclick=self.jsfunc % (jseid, self.jsonmeth)), Button(stdmsgs.BUTTON_CANCEL, onclick=self.jsfunc % (jseid, ''))] - form = self.vreg.select_object('forms', 'edition', self.req, - None, - entity=newcomment, - form_buttons=buttons, - attrcategories=('primary',)) + form = self.vreg['forms'].select_object('edition', self.req, + None, + entity=newcomment, + form_buttons=buttons, + attrcategories=('primary',)) self.w(u'<div id="comment%sSlot">%s</div>' % ( commented.eid, form.form_render(display_label=False, display_relations_form=False))) @@ -216,7 +215,7 @@ eid = self.rset[row][col] self.w(u'<div id="%s" class="%s" cubicweb:rooteid="%s">' % ( self.div_id(), self.div_class(), eid)) - action = self.vreg.select_action('reply_comment', req, self.rset, row=0) + action = self.vreg['actions'].select_object('reply_comment', req, self.rset, row=0) if action is not None: url = self.req.build_ajax_replace_url( 'comment%sHolder' % eid, rql_for_eid(eid), 'inlinecomment')