diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html +++ b/kallithea/templates/changeset/changeset_file_comment.html @@ -122,7 +122,7 @@ ## generate inline comments and the main ones -<%def name="generate_comments(include_pr=False)"> +<%def name="generate_comments()">
## generate inlines for this changeset @@ -131,11 +131,7 @@ %for co in c.comments:
- ## 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
%endfor
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -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