Bugzilla – Attachment 91453 Details for
Bug 23048
Hide non-pickup branches from hold modification select
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23048: Hide non-pickup branches from hold modification select
Bug-23048-Hide-non-pickup-branches-from-hold-modif.patch (text/plain), 3.40 KB, created by
Katrin Fischer
on 2019-07-11 05:57:53 UTC
(
hide
)
Description:
Bug 23048: Hide non-pickup branches from hold modification select
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2019-07-11 05:57:53 UTC
Size:
3.40 KB
patch
obsolete
>From bc7cb35bb86014e917787bd3def1fe81604f6dc7 Mon Sep 17 00:00:00 2001 >From: Pasi Kallinen <pasi.kallinen@koha-suomi.fi> >Date: Thu, 27 Jun 2019 14:03:02 +0300 >Subject: [PATCH] Bug 23048: Hide non-pickup branches from hold modification > select > >When modifying holds in staff client via reserve/request.pl or >the holds-tab in members/moremember.pl, the pickup library dropdown >lists libraries not marked for pickup. Hide those branches, >unless the branch is marked as a pick-up branch for already >existing hold. > >The reason for showing a non-pickup branch for the holds created >before the branch was marked as non-pickup: If the non-pickup branch >wasn't shown, the branch in those holds would get set to the first >branch in the select if the hold was modified. > >Test plan: >1) Create a hold for a patron, to be picked up from a certain branch. >2) Edit the branch and another branch so they are no longer > pickup locations. >3) Go to members/moremember.pl for that patron, check the Holds-tab > Pickup library -drop down. It lists both of the non-pickup branches. >4) Go to reserve/request.pl for that biblio. The hold-table > Pickup library -drop down lists both of the non-pickup branches. >5) Apply patch. >6) Repeat 3 & 4, drop down no longer lists the non-pickup branch, but > should still list the branch where the hold was marked to be picked > from. > >Signed-off-by: Pasi Kallinen <pasi.kallinen@koha-suomi.fi> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/js/holds.js | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >index a878658d21..0e0462d232 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >@@ -125,7 +125,7 @@ > [% Branches.GetName(hold.branchcode) | html %] <input type="hidden" name="pickup" value="[% hold.branchcode | html %]" /> > [% ELSE %] > <select name="pickup"> >- [% PROCESS options_for_libraries libraries => Branches.all( selected => hold.branchcode ) %] >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => hold.branchcode, search_params => { "-or" => { pickup_location => 1, branchcode => hold.branchcode } } ) %] > </select> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js >index 8fe145ef67..97002573cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js >@@ -78,8 +78,9 @@ $(document).ready(function() { > > selectedbranch = " selected='selected' "; > setbranch = CURRENT; >- } >- else{ >+ } else if ( oObj.branches[i].pickup_location == 0 ) { >+ continue; >+ } else{ > selectedbranch = ''; > setbranch = ''; > } >-- >2.11.0
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 23048
:
90322
|
90429
|
91048
|
91453
|
91623