Mercurial > kallithea

diff rhodecode/templates/changeset/changeset_file_comment.html @ 3229:aad51f79d040 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added a flag for generating pull-request comments, and force display on pull-requests
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 26 Jan 2013 21:21:11 +0100
parents 81bbb8086f03
children 0cbf8a502a49
line wrap: on
line diff
--- a/rhodecode/templates/changeset/changeset_file_comment.html	Sat Jan 26 20:11:55 2013 +0100
+++ b/rhodecode/templates/changeset/changeset_file_comment.html	Sat Jan 26 21:21:11 2013 +0100
@@ -108,7 +108,7 @@
 </%def>
 
 ## generate inline comments and the main ones
-<%def name="generate_comments()">
+<%def name="generate_comments(include_pr=False)">
 <div class="comments">
     <div id="inline-comments-container">
     ## generate inlines for this changeset
@@ -119,7 +119,7 @@
         <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:
+          %if not co.pull_request or (co.pull_request and co.status_change) or include_pr:
           ${comment_block(co)}
           %endif
         </div>