diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-03-15 06:30:57 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-03-15 06:30:57 +0100 |
| commit | 0131b54976afdd3662475e7e84ad66c2997c0287 (patch) | |
| tree | b5c8bb7c808dba9c79931a04a39efc3757cb92fe /extensions/Splinter/template/en/default/hook | |
| parent | d936a21ce97276c731abc6830a0ef3c0539e51e9 (diff) | |
| download | bugzilla-0131b54976afdd3662475e7e84ad66c2997c0287.tar.gz bugzilla-0131b54976afdd3662475e7e84ad66c2997c0287.tar.xz | |
Bug 850675: editing the splinter url always appends a /, which results in a broken url
Diffstat (limited to 'extensions/Splinter/template/en/default/hook')
4 files changed, 9 insertions, 24 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 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('\?') %] - <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]&bug=[% attachment.bug_id FILTER uri %]&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 %]&attachment=[% attachment.id FILTER uri %]"> - Splinter Review</a> - [% END %] +   | + <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 %] -  | - [% IF Param("splinter_base").search('\?') %] - <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]&bug=[% bugid FILTER uri %]&attachment=[% attachment.id FILTER uri %]"> - Splinter Review</a> - [% ELSE %] - <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]?bug=[% bugid FILTER uri %]&attachment=[% attachment.id FILTER uri %]"> - Splinter Review</a> - [% END %] +   | + <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 %] - - [% IF Param("splinter_base").search('\?') %] - <a href="[% urlbase FILTER none %][% Param("splinter_base") FILTER html %]&bug=[% request.bug_id FILTER uri %]&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 %]&attachment=[% request.attach_id FILTER uri %]">[review]</a> - [% END %] + + <a href="[% Bugzilla.splinter_review_url(request.bug_id, request.attach_id) FILTER none %]">[review]</a> [% END %] |