Bugzilla – Attachment 64906 Details for
Bug 18469
Suspend all holds when specifying a date to resume hold does not keep date
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18469 - (QA Followup)
Bug-18469---QA-Followup.patch (text/plain), 4.59 KB, created by
Nick Clemens (kidclamp)
on 2017-07-07 11:26:32 UTC
(
hide
)
Description:
Bug 18469 - (QA Followup)
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2017-07-07 11:26:32 UTC
Size:
4.59 KB
patch
obsolete
>From bd6d408c5918d80105fceb7bd17c1f424c64d48c Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 7 Jul 2017 11:25:24 +0000 >Subject: [PATCH] Bug 18469 - (QA Followup) > >Restore datepicker class >Use Koha.Preference >Copy changes ot moremember >--- > 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 ebb8d8b..017540f 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 b5b68c4..88fb468 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 <span class="ex">[% message | html %]</span> > </fieldset> > </form> > >- [% IF SuspendHoldsIntranet %] >+ [% IF Koha.Preference('SuspendHoldsIntranet') %] > <fieldset class="action"> > <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> > <input type="hidden" name="from" value="circ" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <input type="submit" value="Suspend all holds" /> > >- [% IF AutoResumeSuspendedHolds %] >+ [% IF Koha.Preference('AutoResumeSuspendedHolds') %] > <label for="suspend_until">until</label> >- <input type="text" size="10" id="suspend_until" name="suspend_until" /> >+ <input type="text" size="10" id="suspend_until" name="suspend_until" class="datepicker"/> > <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span> > [% END %] > </form> >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) { > </fieldset> > </form> > >- [% IF SuspendHoldsIntranet %] >+ [% IF Koha.Preference('SuspendHoldsIntranet') %] > <fieldset class="action"> > <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> > <input type="hidden" name="from" value="borrower" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <input type="submit" value="Suspend all holds" /> > >- [% IF AutoResumeSuspendedHolds %] >+ [% IF Koha.Preference('AutoResumeSuspendedHolds') %] > <label for="suspend_until">until</label> >- <input type="text" size="10" id="suspend_until" name="suspend_until datepicker"/> >+ <input type="text" size="10" id="suspend_until" name="suspend_until" class="datepicker"/> > <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span> > [% END %] > </form> >diff --git a/members/moremember.pl b/members/moremember.pl >index 0649dcf..7a6e482 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -360,8 +360,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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18469
:
62526
|
62612
|
64906
|
65508
|
65509