diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -19,12 +19,14 @@
${self.breadcrumbs()}
- + %if c.pull_request.is_closed(): +
${_('Closed %s') % (h.age(c.pull_request.updated_on))}
+ %endif

${_('Title')}: ${c.pull_request.title}
%if c.current_changeset_status:
[${h.changeset_status_lbl(c.current_changeset_status)}]
-
+
%endif

@@ -96,11 +98,17 @@ ## template for inline comment form <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> ${comment.comment_inline_form()} - - ## render comments main comments form and it status - ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), - c.current_changeset_status)} - + + ## render comments and inlines + ${comment.generate_comments()} + + % if not c.pull_request.is_closed(): + ## main comment form and it status + ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, + pull_request_id=c.pull_request.pull_request_id), + c.current_changeset_status, + close_btn=True)} + %endif -