kallithea Changeset - aad51f79d040

Changeset - aad51f79d040

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-01-26 21:21:11
marcin@python-works.com

added a flag for generating pull-request comments, and force display on pull-requests

2 files changed with 3 insertions and 3 deletions:

rhodecode/templates/changeset/changeset_file_comment.html

rhodecode/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -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>

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

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

0 comments (0 inline, 0 general)