Mercurial > kallithea

changeset 4313:1721c30d9cbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull requests: don't filter PR comments in the template - the dataset is / must be correct
author Mads Kiilerich <madski@unity3d.com>
date Tue, 10 Dec 2013 19:30:37 +0100
parents cc9a7766d8bd
children d80689aa938d
files kallithea/templates/changeset/changeset_file_comment.html kallithea/templates/pullrequests/pullrequest_show.html
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/changeset/changeset_file_comment.html	Tue Dec 10 19:30:37 2013 +0100
+++ b/kallithea/templates/changeset/changeset_file_comment.html	Tue Dec 10 19:30:37 2013 +0100
@@ -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>
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Tue Dec 10 19:30:37 2013 +0100
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Tue Dec 10 19:30:37 2013 +0100
@@ -220,7 +220,7 @@
     ${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