Attachment 62362 Details for Bug 18453 – [SIGNED-OFF] Bug 18453: Syspref ExportCircHistory is broken

[patch] [SIGNED-OFF] Bug 18453: Syspref ExportCircHistory is broken

SIGNED-OFF-Bug-18453-Syspref-ExportCircHistory-is-.patch (text/plain), 3.63 KB, created by Owen Leonard on 2017-04-19 12:33:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2017-04-19 12:33:44 UTC

Size: 3.63 KB

patch

obsolete

>From 59cc559b9c769b80fc12aa5d34f40660f1475584 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Wed, 19 Apr 2017 09:00:49 +0200
>Subject: [PATCH] [SIGNED-OFF] Bug 18453: Syspref ExportCircHistory is broken
>
>The checkouts table on a patron's checkout and detail screen always show
>a column 'Export' and the 'Export checkouts using format' fields/buttons.
>They should be hidden if syspref 'ExportCircHistory' is set to 'Don't show'.
>
>This patch brings some variables in circulation.tt and in moremember.tt in
>sync. They are used by the checkouts table (checkouts-table.inc).
>
>To test:
>- Apply patch
>- Verify that visibility of export fields in checkouts table depends on
>syspref 'ExportCircHistory' (for both moremember.pl and circulation.pl)
>- Verify that other functionality behaves as expected on both screens.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt   |  2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 11 ++++++-----
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 4e09863..35dec10 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -35,7 +35,7 @@ var interface = "[% interface %]";
> var theme = "[% theme %]";
> var borrowernumber = "[% borrowernumber %]";
> var branchcode = "[% branch %]";
>-var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
>+var exports_enabled = [% Koha.Preference('ExportCircHistory') %];
> var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];
> var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
> var script = "circulation";
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index d5f61d7..75eb24c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -27,14 +27,15 @@
> <script type="text/JavaScript">
> //<![CDATA[
> /* Set some variable needed in circulation.js */
>+var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
> var interface = "[% interface %]";
> var theme = "[% theme %]";
> var borrowernumber = "[% borrowernumber %]";
>-var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
>-var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
>-var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
>+var branchcode = "[% branch %]";
>+var exports_enabled = [% Koha.Preference('ExportCircHistory') %];
> var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];
>-var script = "moremember";
>+var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
>+var script = "circulation";
> var relatives_borrowernumbers = new Array();
> [% FOREACH b IN relatives_borrowernumbers %]
>     relatives_borrowernumbers.push("[% b %]");
>@@ -42,7 +43,7 @@ var relatives_borrowernumbers = new Array();
> 
> var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
> 
>-columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]
>+columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]
> 
> $(document).ready(function() {
>     $('#finesholdsissues').tabs({
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18453: 62353 | 62362 | 62393 | 62394 | 62399 | 62401 | 62402 | 62694 | 62695