##// END OF EJS Templates
fixes inline comments double entries
marcink -
r1681:1bf03daa beta
parent child Browse files
Show More
@@ -84,7 +84,9 class ChangesetCommentsModel(BaseModel):
84 def get_inline_comments(self, repo_id, revision):
84 def get_inline_comments(self, repo_id, revision):
85 comments = self.sa.query(ChangesetComment)\
85 comments = self.sa.query(ChangesetComment)\
86 .filter(ChangesetComment.repo_id == repo_id)\
86 .filter(ChangesetComment.repo_id == repo_id)\
87 .filter(ChangesetComment.revision == revision).all()
87 .filter(ChangesetComment.revision == revision)\
88 .filter(ChangesetComment.line_no != None)\
89 .filter(ChangesetComment.f_path != None).all()
88
90
89 paths = defaultdict(lambda:defaultdict(list))
91 paths = defaultdict(lambda:defaultdict(list))
90
92
@@ -161,7 +161,9
161 ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
161 ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
162 <strong>${_('Leave a comment')}</strong>
162 <strong>${_('Leave a comment')}</strong>
163 <div class="clearfix">
163 <div class="clearfix">
164 <div class="comment-help">${_('Comments parsed using RST syntax')}</div>
164 <div class="comment-help">
165 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
166 </div>
165 ${h.textarea('text')}
167 ${h.textarea('text')}
166 </div>
168 </div>
167 <div class="comment-button">
169 <div class="comment-button">
General Comments 0
You need to be logged in to leave comments. Login now