# HG changeset patch # User Marcin Kuzminski # Date 2013-01-21 23:01:47 # Node ID 786236aa313e1b33e04c006485557ee55f3afe5e # Parent 5308df20306c70776191b33db6272304acee3fe8 Show pull request link also on regular comments that are now attached to separate changesets diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -19,13 +19,23 @@
${co.status_change[0].status_lbl}
-
- %if co.pull_request: - ${_('Status from pull request %s') % co.pull_request.pull_request_id} - %endif -
%endif + +
+ + %if co.pull_request: + + %if co.status_change: + ${_('Status from pull request %s') % co.pull_request.pull_request_id} + %else: + ${_('Comment from pull request %s') % co.pull_request.pull_request_id} + %endif + + %endif + +
+ %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
${_('Delete')}