kallithea Changeset - 1721c30d9cbe

Changeset - 1721c30d9cbe

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

pull requests: don't filter PR comments in the template - the dataset is / must be correct

2 files changed with 2 insertions and 6 deletions:

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -122,7 +122,7 @@ @@
 </%def>
 ## generate inline comments and the main ones
-<%def name="generate_comments(include_pr=False)">
 <%def name="generate_comments()">
 <div class="comments">
     <div id="inline-comments-container">
     ## generate inlines for this changeset
@@ @@ -131,11 +131,7 @@ @@
     %for co in c.comments:
         <div id="comment-tr-${co.comment_id}">
           ## only render comments that are not from pull request, or from
           ## pull request and a status change
           %if not co.pull_request or (co.pull_request and co.status_change) or include_pr:
           ${comment_block(co)}
           %endif
         </div>
     %endfor
 </div>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -220,7 +220,7 @@ ${self.repo_context_bar('showpullrequest @@
     ${comment.comment_inline_form()}
     ## render comments and inlines
-    ${comment.generate_comments(include_pr=True)}
     ${comment.generate_comments()}
     % if not c.pull_request.is_closed():
       ## main comment form and it status

0 comments (0 inline, 0 general)