Skip to content
Snippets Groups Projects
Commit 2f2068a668a3 authored by Sylvain Thénault's avatar Sylvain Thénault
Browse files

use select/name rset argument

parent 81bf50df6aad
No related branches found
No related tags found
No related merge requests found
...@@ -99,8 +99,10 @@ ...@@ -99,8 +99,10 @@
self.req.add_css('cubes.comment.css') self.req.add_css('cubes.comment.css')
entity = self.entity(row, col) entity = self.entity(row, col)
actions = self.vreg['actions'] actions = self.vreg['actions']
action = actions.select_object('interesting', self.req, self.rset, row=row) action = actions.select_object('interesting', self.req,
editaction = actions.select_object('edit_comment', self.req, self.rset, row=row) rset=self.rset, row=row)
editaction = actions.select_object('edit_comment', self.req,
rset=self.rset, row=row)
if action is None: if action is None:
reply = u'' reply = u''
else: else:
...@@ -174,11 +176,9 @@ ...@@ -174,11 +176,9 @@
buttons = [Button(onclick=self.jsfunc % (jseid, self.jsonmeth)), buttons = [Button(onclick=self.jsfunc % (jseid, self.jsonmeth)),
Button(stdmsgs.BUTTON_CANCEL, Button(stdmsgs.BUTTON_CANCEL,
onclick=self.jsfunc % (jseid, ''))] onclick=self.jsfunc % (jseid, ''))]
form = self.vreg['forms'].select_object('edition', self.req, form = self.vreg['forms'].select('edition', self.req,
None, entity=newcomment, form_buttons=buttons,
entity=newcomment, attrcategories=('primary',))
form_buttons=buttons,
attrcategories=('primary',))
self.w(u'<div id="comment%sSlot">%s</div>' % ( self.w(u'<div id="comment%sSlot">%s</div>' % (
commented.eid, form.form_render(display_label=False, commented.eid, form.form_render(display_label=False,
display_relations_form=False))) display_relations_form=False)))
...@@ -215,7 +215,8 @@ ...@@ -215,7 +215,8 @@
eid = self.rset[row][col] eid = self.rset[row][col]
self.w(u'<div id="%s" class="%s" cubicweb:rooteid="%s">' % ( self.w(u'<div id="%s" class="%s" cubicweb:rooteid="%s">' % (
self.div_id(), self.div_class(), eid)) self.div_id(), self.div_class(), eid))
action = self.vreg['actions'].select_object('reply_comment', req, self.rset, row=0) action = self.vreg['actions'].select_object('reply_comment', req,
rset=self.rset, row=0)
if action is not None: if action is not None:
url = self.req.build_ajax_replace_url( url = self.req.build_ajax_replace_url(
'comment%sHolder' % eid, rql_for_eid(eid), 'inlinecomment') 'comment%sHolder' % eid, rql_for_eid(eid), 'inlinecomment')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment