summaryrefslogtreecommitdiffstats
path: root/extensions/Splinter/template/en/default/hook/attachment
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2016-07-12 16:44:03 +0200
committerDavid Lawrence <dkl@mozilla.com>2016-07-12 16:44:03 +0200
commitdc519b098fac5c18b3807e8a7dfd37334799c951 (patch)
treeadfca05db74f5f84399520f147bc10ba786c51f1 /extensions/Splinter/template/en/default/hook/attachment
parentb823202cd93b41b0cf68776a42825f8943f7d7e0 (diff)
downloadbugzilla-dc519b098fac5c18b3807e8a7dfd37334799c951.tar.gz
bugzilla-dc519b098fac5c18b3807e8a7dfd37334799c951.tar.xz
Bug 1283649 - When an attachment is a github pull request link, the pull request diff should be displayed in the edit page
Diffstat (limited to 'extensions/Splinter/template/en/default/hook/attachment')
-rw-r--r--extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl3
-rw-r--r--extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl5
2 files changed, 5 insertions, 3 deletions
diff --git a/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl b/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl
index 7648e1d76..6100deeb7 100644
--- a/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl
+++ b/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl
@@ -19,7 +19,8 @@
# David Lawrence <dkl@mozilla.com>
#%]
-[% IF attachment.ispatch %]
+[% IF attachment.ispatch
+ || (attachment.mimetype == "text/x-github-pull-request" && attachment.external_redirect) %]
&#x0020; |
<a href="[% Bugzilla.splinter_review_url(attachment.bug_id, attachment.id) FILTER none %]">Review</a>
[% END %]
diff --git a/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl b/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl
index ee793b192..e22151b50 100644
--- a/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl
+++ b/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl
@@ -19,7 +19,8 @@
# David Lawrence <dkl@mozilla.com>
#%]
-[% IF attachment.ispatch %]
+[% IF attachment.ispatch
+ || (attachment.mimetype == "text/x-github-pull-request" && attachment.can_review) %]
&#x0020; |
- <a href="[% Bugzilla.splinter_review_url(bugid, attachment.id) FILTER none %]">Review</a>
+ <a href="[% Bugzilla.splinter_review_url(bugid, attachment.id) FILTER none %]">Splinter Review</a>
[% END %]