From 0131b54976afdd3662475e7e84ad66c2997c0287 Mon Sep 17 00:00:00 2001 From: Byron Jones 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/admin/params/splinter.html.tmpl | 2 +- .../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 ++------ .../Splinter/template/en/default/pages/splinter.html.tmpl | 8 ++++---- 6 files changed, 14 insertions(+), 29 deletions(-) (limited to 'extensions/Splinter/template/en/default') diff --git a/extensions/Splinter/template/en/default/admin/params/splinter.html.tmpl b/extensions/Splinter/template/en/default/admin/params/splinter.html.tmpl index c92c62e5d..b28a4bd37 100644 --- a/extensions/Splinter/template/en/default/admin/params/splinter.html.tmpl +++ b/extensions/Splinter/template/en/default/admin/params/splinter.html.tmpl @@ -32,7 +32,7 @@ "the following lines to the .htaccess for Bugzilla: " _ "
" _
                    "RewriteEngine On\n" _
-                   "RewriteRule ^review(\?(.*))? page.cgi?id=splinter.html&$2 [L]" _
+                   "RewriteRule ^review(.*) page.cgi?id=splinter.html\$1 [QSA]" _
                    "
" } %] 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 %] - | - [% IF Param("splinter_base").search('\?') %] - - Splinter Review - [% ELSE %] - - Splinter Review - [% END %] + | + Review [% 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 %] - | - [% IF Param("splinter_base").search('\?') %] - - Splinter Review - [% ELSE %] - - Splinter Review - [% END %] + | + Review [% 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 %] -   - [% IF Param("splinter_base").search('\?') %] - [review] - [% ELSE %] - [review] - [% END %] +   + [review] [% END %] diff --git a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl index 1814da58c..fc4748548 100644 --- a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl +++ b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl @@ -44,10 +44,10 @@ [% can_edit = 0 %]