From 78233d1524ccaad607fb326552452ea8ff05567a Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 7 Jul 2017 11:25:24 +0000 Subject: [PATCH] Bug 18469: QA Follow-up Content-Type: text/plain; charset=utf-8 Restore datepicker class Use Koha.Preference Copy changes to moremember Signed-off-by: Marcel de Rooy --- circ/circulation.pl | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++--- members/moremember.pl | 2 -- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index fad8623..3c4ac34 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -636,8 +636,6 @@ $template->param( AudioAlerts => C4::Context->preference("AudioAlerts"), fast_cataloging => $fast_cataloging, CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"), - SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'), - AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), RoutingSerials => C4::Context->preference('RoutingSerials'), relatives_issues_count => $relatives_issues_count, relatives_borrowernumbers => \@relatives, 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 9fb7cc2..1980c8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -985,16 +985,16 @@ No patron matched [% message | html %] - [% IF SuspendHoldsIntranet %] + [% IF Koha.Preference('SuspendHoldsIntranet') %]
- [% IF AutoResumeSuspendedHolds %] + [% IF Koha.Preference('AutoResumeSuspendedHolds') %] - + Specify date on which to resume [% INCLUDE 'date-format.inc' %]: [% END %]
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 6e5308f..fd6b5e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -607,16 +607,16 @@ function validate1(date) {
- [% IF SuspendHoldsIntranet %] + [% IF Koha.Preference('SuspendHoldsIntranet') %]
- [% IF AutoResumeSuspendedHolds %] + [% IF Koha.Preference('AutoResumeSuspendedHolds') %] - + Specify date on which to resume [% INCLUDE 'date-format.inc' %]: [% END %]
diff --git a/members/moremember.pl b/members/moremember.pl index 320feee..b70a068 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -357,8 +357,6 @@ $template->param( quickslip => $quickslip, housebound_role => scalar $patron->housebound_role, privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'}, - AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), - SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'), RoutingSerials => C4::Context->preference('RoutingSerials'), PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20, relatives_issues_count => $relatives_issues_count, -- 2.1.4