diff --git a/entities.py b/entities.py index 3fc27320dabec0ca30b01995ea1612f62ff405e7_ZW50aXRpZXMucHk=..f1010c58ee2b9192ae5f16e71830ac8468502a80_ZW50aXRpZXMucHk= 100644 --- a/entities.py +++ b/entities.py @@ -60,7 +60,7 @@ class CommentFullThreadText(CommentFullTextView): """display a comment and its parents""" id = 'fullthreadtext' - + def cell_call(self, row, col): e = self.entity(row, col) strings = [] @@ -81,7 +81,7 @@ """same as fullthreadtext, but going from top level object to leaf comments """ id = 'fullthreadtext_descending' - + def cell_call(self, row, col, indentlevel=0): e = self.entity(row, col) self.w(e.view('fulltext', indentlevel=indentlevel).strip() + '\n') diff --git a/views.py b/views.py index 3fc27320dabec0ca30b01995ea1612f62ff405e7_dmlld3MucHk=..f1010c58ee2b9192ae5f16e71830ac8468502a80_dmlld3MucHk= 100644 --- a/views.py +++ b/views.py @@ -37,7 +37,7 @@ class CommentPrimaryView(baseviews.PrimaryView): __select__ = implements('Comment') - + def cell_call(self, row, col): self.req.add_css('cubes.comment.css') entity = self.complete_entity(row, col) @@ -66,7 +66,7 @@ self.w(u'<div class="commentBottom">%s</div>\n' % txt) self.w(u'</div>\n') - + class CommentSecondaryView(baseviews.SecondaryView): __select__ = implements('Comment') @@ -70,7 +70,7 @@ class CommentSecondaryView(baseviews.SecondaryView): __select__ = implements('Comment') - + def cell_call(self, row, col, **kwargs): entity = self.entity(row, col) root = entity.root() @@ -91,7 +91,7 @@ class CommentTreeItemView(baseviews.ListItemView): id = 'treeitem' __select__ = implements('Comment') - + def cell_call(self, row, col, **kwargs): _ = self.req._ self.req.add_js('cubicweb.ajax.js') @@ -117,7 +117,7 @@ text = entity.printable_value('content') if not kwargs.get('full'): maxsize = self.req.property_value('navigation.short-line-size') - text = safe_cut(text, maxsize) + text = safe_cut(text, maxsize) self.w(u'<div class="commentInfo">') self.w(self.format_date(entity.creation_date)) if entity.creator: @@ -134,7 +134,7 @@ """a recursive tree view""" __select__ = implements('Comment') title = _('thread view') - + def open_item(self, entity): self.w(u'<li id="comment%s" class="comment">\n' % entity.eid) @@ -148,8 +148,8 @@ def cell_call(self, row, col): entity = self.entity(row, col) self.wview('inlinecommentform', None, commented=entity) - + class InlineCommentForm(FormViewMixIn, EntityView): id = 'inlinecommentform' __select__ = match_kwargs('commented') # explicit call when it makes sense @@ -152,10 +152,10 @@ class InlineCommentForm(FormViewMixIn, EntityView): id = 'inlinecommentform' __select__ = match_kwargs('commented') # explicit call when it makes sense - + def call(self, commented): self.initialize_varmaker() newcomment = self.vreg.etype_class('Comment')(self.req) newcomment.eid = self.varmaker.next() self.comment_form(commented, newcomment) @@ -157,9 +157,9 @@ def call(self, commented): self.initialize_varmaker() newcomment = self.vreg.etype_class('Comment')(self.req) newcomment.eid = self.varmaker.next() self.comment_form(commented, newcomment) - + def comment_form(self, commented, newcomment=None): self.req.add_js('cubes.comment.js') if newcomment is None: @@ -180,7 +180,7 @@ class InlineEditCommentForm(InlineCommentForm): id = 'editcomment' __select__ = implements('Comment') - + def cell_call(self, row, col): self.comment_form(self.entity(row, col)) @@ -184,7 +184,7 @@ def cell_call(self, row, col): self.comment_form(self.entity(row, col)) - + # comment component ########################################################### class CommentSectionVComponent(EntityVComponent): @@ -209,7 +209,7 @@ if req.use_fckeditor() and req.property_value('ui.default-text-format') == 'text/html': req.fckeditor_config() else: - reply = u'' + reply = u'' if orderby == 'author': rql = u'Any C,CD,CC,CCF,U,UL,US,UF ORDERBY UL WHERE C is Comment, '\ 'C comments X, C creation_date CD, C content CC, C content_format CCF, ' \ @@ -243,7 +243,7 @@ etype = 'Comment' rtype = 'comments' target = 'subject' - + title = _('reply to this comment') category = 'hidden' order = 111 @@ -266,7 +266,7 @@ etype = 'Comment' rtype = 'comments' role = 'object' - + title = _('add comment') category = 'hidden' order = 111 @@ -275,7 +275,7 @@ class EditCommentAction(Action): id = 'edit_comment' __select__ = one_line_rset() & implements('Comment') & has_permission('update') - + title = _('edit comment') category = 'hidden' order = 110