Attachment 84204 Details for Bug 18589 – Bug 18589: (follow-up) Fix QA errors

[patch] Bug 18589: (follow-up) Fix QA errors

Bug-18589-follow-up-Fix-QA-errors.patch (text/plain), 3.04 KB, created by Andrew Isherwood on 2019-01-18 15:40:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2019-01-18 15:40:17 UTC

Size: 3.04 KB

patch

obsolete

>From d0f2399caf00bba171891f76b4b0aa6a531b80d8 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Fri, 18 Jan 2019 15:39:33 +0000
>Subject: [PATCH] Bug 18589: (follow-up) Fix QA errors
>
>This patch fixes the "missing_filter" QA errors
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc     | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt     | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt | 6 +++---
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
>index c758ba5054..0b6169a27d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
>@@ -1,6 +1,6 @@
> <div>
>     [% IF prefilters.length > 0 %]
>-    <table id="ill-requests" data-prefilters="[% prefilters %]">
>+    <table id="ill-requests" data-prefilters="[% prefilters | html %]">
>     [% ELSE %]
>     <table id="ill-requests">
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index b8a0e66286..6457618dc2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -533,8 +533,8 @@
>             metric: 'dd/mm/yy',
>             us: 'mm/dd/yy'
>         };
>-        var dateFormat = dateMap['[% Koha.Preference('dateformat') %]'];
>-        var prefilters = '[% prefilters %]';
>+        var dateFormat = dateMap['[% Koha.Preference('dateformat') | html %]'];
>+        var prefilters = '[% prefilters | html %]';
>         // Set column settings
>         var columns_settings = [% ColumnsSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
>     </script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>index c5c549729c..fd77b38f10 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>@@ -10,7 +10,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Patrons &rsaquo; ILL requests for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-[% Asset.css("css/datatables.css") %]
>+[% Asset.css("css/datatables.css") | $raw %]
> </head>
> 
> <body>
>@@ -52,8 +52,8 @@
>                 metric: 'dd/mm/yy',
>                 us: 'mm/dd/yy'
>             };
>-            var dateFormat = dateMap['[% Koha.Preference('dateformat') %]'];
>-            var prefilters = '[% prefilters %]';
>+            var dateFormat = dateMap['[% Koha.Preference('dateformat') | html %]'];
>+            var prefilters = '[% prefilters | html %]';
>             // Set column settings
>             var columns_settings = [% ColumnsSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
>         </script>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 18589: 74809 | 79692 | 82177 | 82513 | 84197 | 84199 | 84204 | 84792 | 84796 | 86432 | 86433 | 86456 | 86465 | 86504 | 86506 | 86507 | 86714 | 86715 | 86716 | 86717 | 86718 | 86719 | 86720 | 86721 | 86722 | 86735 | 86736 | 86737