Attachment 81763 Details for Bug 21526 – Bug 21526: (follow-up) Use the 'url' filter when needed

[patch] Bug 21526: (follow-up) Use the 'url' filter when needed

Bug-21526-follow-up-Use-the-url-filter-when-needed.patch (text/plain), 3.20 KB, created by Jonathan Druart on 2018-10-31 17:37:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-10-31 17:37:02 UTC

Size: 3.20 KB

patch

obsolete

>From 9c29a5e84f00187f29ab601429179a65bb7b93cf Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 31 Oct 2018 14:31:36 -0300
>Subject: [PATCH] Bug 21526: (follow-up) Use the 'url' filter when needed
>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt           | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt         | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index 5fcf68faee..141b01aff8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% BLOCK csv_export %]
>     <div class="btn-group">
>-        <a id="exportbutton" class="btn btn-default btn-sm" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]"><i class="fa fa-download"></i> Export as CSV</a>
>+        <a id="exportbutton" class="btn btn-default btn-sm" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
>       <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
>       <ul class="dropdown-menu" id="export-csv-menu">
>           <li><a href="#">Default</a></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>index 6c77aba1ca..b62ceac5d5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -96,7 +96,7 @@
> </ol></fieldset> 
>     <fieldset class="action">
>         <input type="submit" value="Save changes" />
>-        <a class="cancel" href="[% script_name | url %]?frameworkcode=[% framework.frameworkcode | html %]">Cancel</a>
>+        <a class="cancel" href="[% script_name | url %]?frameworkcode=[% framework.frameworkcode | uri %]">Cancel</a>
>     </fieldset>
>     </form>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>index d6c38ec6c2..78f74fd4c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>@@ -13,7 +13,7 @@
> [% END %]
> [% INCLUDE 'doc-head-close.inc' %]
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
>+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
> [% Asset.css("css/print.css") | $raw %]
> [% IF ( Koha.Preference('SlipCSS') ) %]
> <link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') | $raw %]" />
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21526: 80337 | 80641 | 80649 | 80661 | 80725 | 80755 | 80756 | 81058 | 81059 | 81300 | 81301 | 81302 | 81337 | 81530 | 81763 | 81764 | 82011 | 82012 | 82013 | 82140 | 82141 | 82142 | 82600