Attachment 99568 Details for Bug 23980 – Bug 23980: Revert "Bug 23229: Only load ILL table JS when needed"

[patch] Bug 23980: Revert "Bug 23229: Only load ILL table JS when needed"

Bug-23980-Revert-Bug-23229-Only-load-ILL-table-JS-.patch (text/plain), 1.86 KB, created by Bernardo Gonzalez Kriegel on 2020-02-25 10:55:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernardo Gonzalez Kriegel

Created: 2020-02-25 10:55:20 UTC

Size: 1.86 KB

patch

obsolete

>From 1081135cc0308d147cbcb78118ea48e0614a9680 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Wed, 11 Dec 2019 11:10:26 +0000
>Subject: [PATCH] Bug 23980: Revert "Bug 23229: Only load ILL table JS when
> needed"
>
>This reverts commit f95749a66bb5dad53fa2cf00224fc38f52c1e788.
>
>https://bugs.koha-community.org/show_bug.cgi?id=23980
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Fixed commit title, no errors
>
>Revised test plan:
>- Do not apply the patch
>- View koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>- TEST: Verify that it includes a "jsinclude" block near the bottom of the template
>- Apply the patch
>- Re-open the template
>- TEST: Verify that the "jsinclude" block is now gone
>---
> .../prog/en/modules/ill/ill-requests.tt          | 16 ----------------
> 1 file changed, 16 deletions(-)
>
>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 d3f8092081..33c97b865e 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
>@@ -713,22 +713,6 @@
>         </div>
>     </div>
> 
>-[% MACRO jsinclude BLOCK %]
>-    [% INCLUDE 'datatables.inc' %]
>-    [% INCLUDE 'columns_settings.inc' %]
>-    [% INCLUDE 'calendar.inc' %]
>-    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
>-    <script>
>-        var prefilters = '[% prefilters | $raw %]';
>-        // Set column settings
>-        var columns_settings = [% ColumnsSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
>-    </script>
>-    [% IF query_type == 'illlist' %]
>-    [% INCLUDE 'ill-list-table-strings.inc' %]
>-    [% Asset.js("js/ill-list-table.js") | $raw %]
>-    [% END %]
>-[% END %]
>-
> [% TRY %]
> [% PROCESS backend_jsinclude %]
> [% CATCH %]
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 23980: 95112 | 96191 | 96192 | 99567 | 99568 | 100109 | 100110