Bugzilla – Attachment 140952 Details for
Bug 30579
When placing item level hold, some options that are not used are not disabled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30579: Whitespace
Bug-30579-Whitespace.patch (text/plain), 27.31 KB, created by
Nick Clemens (kidclamp)
on 2022-09-23 15:52:33 UTC
(
hide
)
Description:
Bug 30579: Whitespace
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2022-09-23 15:52:33 UTC
Size:
27.31 KB
patch
obsolete
>From 4bf3171dfaa4f052a9d605eca9b8b651971a6c89 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 23 Sep 2022 15:13:06 +0000 >Subject: [PATCH] Bug 30579: Whitespace > >--- > .../prog/en/modules/reserve/request.tt | 325 +++++++++--------- > 1 file changed, 163 insertions(+), 162 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index ac239eb3d3..beaed01f15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -505,46 +505,46 @@ > </div> > > [% UNLESS ( multi_hold ) %] >- <fieldset class="rows"> >- <legend>Hold details</legend> >- <form action="placerequest.pl" method="post" name="form" id="hold-request-form"> >+ <fieldset class="rows"> >+ <legend>Hold details</legend> >+ <form action="placerequest.pl" method="post" name="form" id="hold-request-form"> > >- <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >- [% FOREACH biblionumber IN biblionumbers %] >- <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/> >- [% END %] >- <input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblio.biblionumber | html %]"/> >- <input type="hidden" name="title" value="[% biblio.title | html %]" /> >- <input type="hidden" name="rank-request" value="[% fixedRank | html %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >+ [% FOREACH biblionumber IN biblionumbers %] >+ <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/> >+ [% END %] >+ <input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblio.biblionumber | html %]"/> >+ <input type="hidden" name="title" value="[% biblio.title | html %]" /> >+ <input type="hidden" name="rank-request" value="[% fixedRank | html %]" /> > >- <ol> >- <li> >- <span class="label">Patron:</span> >- [% IF ( patron.borrowernumber ) %] >- [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] >- [% ELSE %] >- Not defined yet >- [% END %] >- </li> >+ <ol> >+ <li> >+ <span class="label">Patron:</span> >+ [% IF ( patron.borrowernumber ) %] >+ [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] >+ [% ELSE %] >+ Not defined yet >+ [% END %] >+ </li> > >- <li> >- <span class="label">Estimated priority:</span> >- <strong>[% fixedRank | html %]</strong> >- </li> >+ <li> >+ <span class="label">Estimated priority:</span> >+ <strong>[% fixedRank | html %]</strong> >+ </li> > >- <li> >- <label for="holdnotes">Notes:</label> >- <textarea id="holdnotes" name="notes" cols="30" rows="1"></textarea> >- </li> >- <li> >- <label for="pickup">Pickup at:</label> >- <select name="pickup" id="pickup" >- data-biblio-id="[% biblio.biblionumber | html %]" >- data-patron-id="[% patron.borrowernumber | html %]" >- data-pickup-location-source="biblio"> >- [% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %] >- </select> >- </li> >+ <li> >+ <label for="holdnotes">Notes:</label> >+ <textarea id="holdnotes" name="notes" cols="30" rows="1"></textarea> >+ </li> >+ <li> >+ <label for="pickup">Pickup at:</label> >+ <select name="pickup" id="pickup" >+ data-biblio-id="[% biblio.biblionumber | html %]" >+ data-patron-id="[% patron.borrowernumber | html %]" >+ data-pickup-location-source="biblio"> >+ [% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %] >+ </select> >+ </li> > > [% IF Koha.Preference('AllowHoldItemTypeSelection') %] > <li> >@@ -558,46 +558,46 @@ > </li> > [% END %] > >- [% IF ( reserve_in_future ) %] >- <li> >- <label for="from">Hold starts on date:</label> >- <input id="reserve_date" name="reserve_date" id="from" size="10" type="text" data-date_to="expiration_date" class="flatpickr" data-flatpickr-futuredate="true" /> >- </li> >- [% END %] >- >- <li> >- <label for="to">Hold expires on date:</label> >- <input id="expiration_date" name="expiration_date" id="to" size="10" type="text" class="flatpickr" data-flatpickr-futuredate="true" /> >- </li> >+ [% IF ( reserve_in_future ) %] >+ <li> >+ <label for="from">Hold starts on date:</label> >+ <input id="reserve_date" name="reserve_date" id="from" size="10" type="text" data-date_to="expiration_date" class="flatpickr" data-flatpickr-futuredate="true" /> >+ </li> >+ [% END %] > > <li> >- <label for="requestany">Hold next available item </label> >- [% IF force_hold_level == 'item' %] >- <input type="checkbox" id="requestany" name="request" disabled="true" /> >- [% ELSIF force_hold_level == 'record' %] >- <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/> >- <input type="hidden" name="request" value="Any"/> >- [% ELSE %] >- <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" /> >- [% END %] >- <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" /> >+ <label for="to">Hold expires on date:</label> >+ <input id="expiration_date" name="expiration_date" id="to" size="10" type="text" class="flatpickr" data-flatpickr-futuredate="true" /> > </li> > >- [% IF remaining_holds_for_record > 1 %] > <li> >- <label for="holds_to_place_count">Holds to place (count)</label> >- <input type="text" inputmode="numeric" pattern="[0-9]*" id="holds_to_place_count" name="holds_to_place_count" maxlength="[% remaining_holds_for_record | html %]" value="1" /> >+ <label for="requestany">Hold next available item </label> >+ [% IF force_hold_level == 'item' %] >+ <input type="checkbox" id="requestany" name="request" disabled="true" /> >+ [% ELSIF force_hold_level == 'record' %] >+ <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/> >+ <input type="hidden" name="request" value="Any"/> >+ [% ELSE %] >+ <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" /> >+ [% END %] >+ <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" /> > </li> >- [% ELSE %] >- <input type="hidden" name="holds_to_place_count" value="1" /> >- [% END %] > >- <li id="non_priority_list_item"> >- <label for="non_priority">Non priority hold:</label> >- <input name="non_priority" id="non_priority" type="checkbox" /> >- <span class="hint">A non priority hold doesn't prevent a current checkout from renewing</span> >- </li> >- </ol> >+ [% IF remaining_holds_for_record > 1 %] >+ <li> >+ <label for="holds_to_place_count">Holds to place (count)</label> >+ <input type="text" inputmode="numeric" pattern="[0-9]*" id="holds_to_place_count" name="holds_to_place_count" maxlength="[% remaining_holds_for_record | html %]" value="1" /> >+ </li> >+ [% ELSE %] >+ <input type="hidden" name="holds_to_place_count" value="1" /> >+ [% END %] >+ >+ <li id="non_priority_list_item"> >+ <label for="non_priority">Non priority hold:</label> >+ <input name="non_priority" id="non_priority" type="checkbox" /> >+ <span class="hint">A non priority hold doesn't prevent a current checkout from renewing</span> >+ </li> >+ </ol> > > <fieldset class="action"> > [% IF ( patron.borrowernumber ) %] >@@ -839,111 +839,112 @@ > [% END # /IF hiddencount %] > > [% ELSE # /UNLESS multi_hold %] >- <fieldset class="rows"> >- <legend>Hold details</legend> >- <form action="placerequest.pl" method="post" name="form" id="hold-request-form"> >- <input type="hidden" name="multi_holds" id="multi_holds" value="1" /> >- <input type="hidden" name="request" value="any"/> >- <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >- [% FOREACH biblioloo IN biblioloop %] >- <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblioloo.biblionumber | html %]"/> >- [% UNLESS biblioloo.none_avail %] >- <input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblioloo.biblionumber | html %]"/> >- <input type="hidden" name="title_[% biblioloo.biblionumber | html %]" value="[% biblioloo.title | html %]"/> >- <input type="hidden" name="rank_[% biblioloo.biblionumber | html %]" value="[% biblioloo.rank | html %]"/> >- [% END %] >- [% END %] >- >- <table id="requesttitles"> >- <tr> >- <th> </th> >- <th>Pickup location</th> >- <th>Title</th> >- [% UNLESS Koha.Preference('item-level_itypes') %] >- <th>Item type</th> >- [% END %] >- <th>Priority</th> >- <th>Information</th> >- </tr> >- [% FOREACH biblioloo IN biblioloop %] >- [% IF ( biblioloo.warn ) %] >- <tr class="onissue"> >- [% ELSE %] >- <tr> >- [% END %] >- <td> >- [% UNLESS ( biblioloo.warn ) %] >- <input class="multi_hold_item_checkbox" type="checkbox" checked="checked" title="[% biblioloo.biblionumber | html %]"/> >+ <fieldset class="rows"> >+ <legend>Hold details</legend> >+ <form action="placerequest.pl" method="post" name="form" id="hold-request-form"> >+ <input type="hidden" name="multi_holds" id="multi_holds" value="1" /> >+ <input type="hidden" name="request" value="any"/> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >+ [% FOREACH biblioloo IN biblioloop %] >+ <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblioloo.biblionumber | html %]"/> >+ [% UNLESS biblioloo.none_avail %] >+ <input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblioloo.biblionumber | html %]"/> >+ <input type="hidden" name="title_[% biblioloo.biblionumber | html %]" value="[% biblioloo.title | html %]"/> >+ <input type="hidden" name="rank_[% biblioloo.biblionumber | html %]" value="[% biblioloo.rank | html %]"/> > [% END %] >- </td> >- <td> >- [% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %] >- <select name="pickup_[% biblioloo.biblionumber | html %]" >- class="multi_pickup_select" >- data-biblio-id="[% biblioloo.biblionumber | html %]" >- data-patron-id="[% patron.borrowernumber | html %]" >- data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'> >- <option value=""></option> >- [% FOREACH pickup_location IN biblioloo.pickup_locations %] >- <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option> >- [% END %] >- </select> >- [% END %] >- </td> >- <td> >- <ul> >- <li> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">[% biblioloo.title | html %]</a> >- [% IF biblioloo.author %] by [% biblioloo.author | html %][% END %] >- </li> >- [% IF ( biblioloo.publicationyear ) %] >+ [% END %] >+ >+ <table id="requesttitles"> >+ <tr> >+ <th> </th> >+ <th>Pickup location</th> >+ <th>Title</th> >+ [% UNLESS Koha.Preference('item-level_itypes') %] >+ <th>Item type</th> >+ [% END %] >+ <th>Priority</th> >+ <th>Information</th> >+ </tr> >+ [% FOREACH biblioloo IN biblioloop %] >+ [% IF ( biblioloo.warn ) %] >+ <tr class="onissue"> >+ [% ELSE %] >+ <tr> >+ [% END %] >+ <td> >+ [% UNLESS ( biblioloo.warn ) %] >+ <input class="multi_hold_item_checkbox" type="checkbox" checked="checked" title="[% biblioloo.biblionumber | html %]"/> >+ [% END %] >+ </td> >+ <td> >+ [% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %] >+ <select name="pickup_[% biblioloo.biblionumber | html %]" >+ class="multi_pickup_select" >+ data-biblio-id="[% biblioloo.biblionumber | html %]" >+ data-patron-id="[% patron.borrowernumber | html %]" >+ data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'> >+ <option value=""></option> >+ [% FOREACH pickup_location IN biblioloo.pickup_locations %] >+ <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option> >+ [% END %] >+ </select> >+ [% END %] >+ </td> >+ <td> >+ <ul> > <li> >- <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">[% biblioloo.title | html %]</a> >+ [% IF biblioloo.author %] by [% biblioloo.author | html %][% END %] > </li> >+ [% IF ( biblioloo.publicationyear ) %] >+ <li> >+ <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] >+ </li> >+ [% END %] >+ </ul> >+ [% IF ( biblioloo.warn ) %] >+ <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span> > [% END %] >- </ul> >- [% IF ( biblioloo.warn ) %] >- <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span> >- [% END %] >- </td> >- [% UNLESS Koha.Preference('item-level_itypes') %] >- <td> >- <img src="[% biblioloo.itemtype.image_location | html %]" alt="[% biblioloo.itemtype.translated_description | html %]" title="[% biblioloo.itemtype.translated_description | html %]" /> > </td> >- [% END %] >- <td>[% biblioloo.rank | html %]</td> >- <td> >- [% IF ( biblioloo.checked_previously ) %] >- <span>Patron has previously checked out this title</span><br/> >+ [% UNLESS Koha.Preference('item-level_itypes') %] >+ <td> >+ <img src="[% biblioloo.itemtype.image_location | html %]" alt="[% biblioloo.itemtype.translated_description | html %]" title="[% biblioloo.itemtype.translated_description | html %]" /> >+ </td> > [% END %] >- [% IF ( biblioloo.alreadyres ) %] >- <ul> >- [% ELSE %] >- [% IF ( biblioloo.none_avail || biblioloo.noitems ) %] >+ <td>[% biblioloo.rank | html %]</td> >+ <td> >+ [% IF ( biblioloo.checked_previously ) %] >+ <span>Patron has previously checked out this title</span><br/> >+ [% END %] >+ [% IF ( biblioloo.alreadyres ) %] > <ul> >+ [% ELSE %] >+ [% IF ( biblioloo.none_avail || biblioloo.noitems ) %] >+ <ul> >+ [% END %] > [% END %] >- [% END %] >- >- [% IF ( biblioloo.alreadyres ) %] >- <li> >- [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] <strong>already has a hold</strong> on this item >- </li> >- [% END %] >- [% IF ( biblioloo.none_avail || biblioloo.noitems ) %] >- <li> <strong>No items are available</strong> to be placed on hold</li> >- [% END %] > >- [% IF ( biblioloo.alreadyres ) %] >- </ul> >- [% ELSE %] >+ [% IF ( biblioloo.alreadyres ) %] >+ <li> >+ [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] <strong>already has a hold</strong> on this item >+ </li> >+ [% END %] > [% IF ( biblioloo.none_avail || biblioloo.noitems ) %] >+ <li> <strong>No items are available</strong> to be placed on hold</li> >+ [% END %] >+ >+ [% IF ( biblioloo.alreadyres ) %] > </ul> >+ [% ELSE %] >+ [% IF ( biblioloo.none_avail || biblioloo.noitems ) %] >+ </ul> >+ [% END %] > [% END %] >- [% END %] >- </td> >- </tr> >- [% END # /FOREACH biblioloo %] >- </table> <!-- /#requesttitles --> >+ </td> >+ </tr> >+ [% END # /FOREACH biblioloo %] >+ </table> <!-- /#requesttitles --> >+ </fieldset> > > [% END # /UNLESS multi_hold %] > >-- >2.30.2
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=140952">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30579
:
133549
|
133550
|
133574
|
133575
|
133689
|
133690
|
134270
|
134468
|
134469
|
134491
|
134492
|
134493
|
134893
|
134894
|
140951
|
140952
|
140953
|
140954
|
148835
|
148898
|
149271
|
150767
|
150786
|
151483
|
151493
|
151558
|
154881
|
154882
|
154883
|
154886
|
157787
|
157788
|
157789
|
157790
|
157791
|
157792
|
157937
|
157938
|
157939
|
157940
|
157941
|
157942
|
157943
|
163260
|
163261
|
163262
|
163263
|
163264
|
163265
|
163266
|
163267
|
166012
|
166013
|
166014
|
166015
|
166016
|
166017
|
166018
|
166019
|
166034
|
166035
|
166036
|
166037
|
166038
|
166039
|
166040
|
166041
|
166074
|
166075
|
166076
|
166077
|
166078
|
166079
|
166080
|
166081
|
166082
|
166264
|
166265
|
166266
|
166267
|
166268
|
166269
|
166270
|
166271
|
166272
|
166273
|
166274
|
166275