From 0131b54976afdd3662475e7e84ad66c2997c0287 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 15 Mar 2013 13:30:57 +0800
Subject: Bug 850675: editing the splinter url always appends a /, which
 results in a broken url

---
 .../template/en/default/hook/attachment/edit-action.html.tmpl  | 10 ++--------
 .../template/en/default/hook/attachment/list-action.html.tmpl  | 10 ++--------
 .../en/default/hook/request/email-after_summary.txt.tmpl       |  5 +++--
 .../en/default/hook/request/queue-after_column.html.tmpl       |  8 ++------
 4 files changed, 9 insertions(+), 24 deletions(-)

(limited to 'extensions/Splinter/template/en/default/hook')

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 ba564d4b4..7648e1d76 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
@@ -20,12 +20,6 @@
   #%]
 
 [% IF attachment.ispatch %]
-&#x0020; |
-  [% IF Param("splinter_base").search('\?') %]
-    <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]&amp;bug=[% attachment.bug_id FILTER uri %]&amp;attachment=[% attachment.id FILTER uri%]">
-      Splinter Review</a>
-  [% ELSE %]
-    <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]?bug=[% attachment.bug_id FILTER uri %]&amp;attachment=[% attachment.id FILTER uri %]">
-      Splinter Review</a>
-  [% END %]
+  &#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 51babf079..cd2db2770 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
@@ -20,12 +20,6 @@
   #%]
 
 [% IF attachment.ispatch %]
-&#x0020; |
-  [% IF Param("splinter_base").search('\?') %]
-    <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]&amp;bug=[% bugid FILTER uri %]&amp;attachment=[% attachment.id FILTER uri %]">
-      Splinter Review</a>
-  [% ELSE %]
-    <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]?bug=[% bugid FILTER uri %]&amp;attachment=[% attachment.id FILTER uri %]">
-      Splinter Review</a>
-  [% END %]
+  &#x0020; |
+  <a href="[% Bugzilla.splinter_review_url(bug.id, attachment.id) FILTER none %]">Review</a>
 [% END %]
diff --git a/extensions/Splinter/template/en/default/hook/request/email-after_summary.txt.tmpl b/extensions/Splinter/template/en/default/hook/request/email-after_summary.txt.tmpl
index 320d20a82..c9717fbd6 100644
--- a/extensions/Splinter/template/en/default/hook/request/email-after_summary.txt.tmpl
+++ b/extensions/Splinter/template/en/default/hook/request/email-after_summary.txt.tmpl
@@ -1,6 +1,7 @@
+[% USE Bugzilla %]
 [% IF flag && flag.status == '?' && flag.type.name == 'review' && attachment && attachment.ispatch %]
 
-Splinter Review
-[%+ urlbase FILTER none %][% Param('splinter_base') %]&bug=[% bug.bug_id FILTER uri %]&attachment=[% attachment.id FILTER uri %]
+Review
+[%+ Bugzilla.splinter_review_url(request.bug_id, request.attach_id) FILTER none %]
 [%- END %]
 
diff --git a/extensions/Splinter/template/en/default/hook/request/queue-after_column.html.tmpl b/extensions/Splinter/template/en/default/hook/request/queue-after_column.html.tmpl
index 5d1c7a2bb..a5fc61cea 100644
--- a/extensions/Splinter/template/en/default/hook/request/queue-after_column.html.tmpl
+++ b/extensions/Splinter/template/en/default/hook/request/queue-after_column.html.tmpl
@@ -1,8 +1,4 @@
 [% IF column == 'attachment' && request.ispatch %]
-  &nbsp; 
-  [% IF Param("splinter_base").search('\?') %]
-    <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]&amp;bug=[% request.bug_id FILTER uri %]&amp;attachment=[% request.attach_id FILTER uri %]">[review]</a>
-  [% ELSE %]
-    <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]?bug=[% request.bug_id FILTER uri %]&amp;attachment=[% request.attach_id FILTER uri %]">[review]</a>
-  [% END %]
+  &nbsp;
+  <a href="[% Bugzilla.splinter_review_url(request.bug_id, request.attach_id) FILTER none %]">[review]</a>
 [% END %]
-- 
cgit v1.2.3-24-g4f1b