From c26108afa776b9de93ebe7c334c0eeff8ea2ed98 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 Restore datepicker class Use Koha.Preference Copy changes to moremember Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit a66c0b1dd76a2fe08ed7ac189ad8a564372ab3a9) Signed-off-by: Fridolin Somers --- circ/circulation.pl | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- .../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 f5932858a2..5f85d793f3 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -637,8 +637,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 acac9b2850..6c1fd20e26 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -986,16 +986,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 6e5308f937..fd6b5e96c6 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 ad71dfc9a8..1ac6a3d404 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -362,8 +362,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.39.5