Created attachment 67122 [details] [review] Bug 19301: Move C4::Reserves::OnShelfHoldsAllowed to get_onshelfholds_policy Following the pattern introduced by bug 19300, we are going to move the OnShelfHoldsAllowed logic to Koha::IssuingRules->get_onshelfholds_policy Test plan: Make sure the onshelfholds policy is correct when placing a hold
Created attachment 67123 [details] [review] Bug 19301: Remove C4::Reserves::OnShelfHoldsAllowed At this point the subroutine is not used anymore
I had issues with applying this patch: Apply? [(y)es, (n)o, (i)nteractive] i Applying: Bug 19301: Move C4::Reserves::OnShelfHoldsAllowed to get_onshelfholds_policy fatal: sha1 information is lacking or useless (C4/Reserves.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 19301: Move C4::Reserves::OnShelfHoldsAllowed to get_onshelfholds_policy The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-19301-Move-C4ReservesOnShelfHoldsAllowed-to-ge-7LzZnO.patch
(In reply to Alex Buckley from comment #3) > I had issues with applying this patch: One dependency was missing, please try again on top of 19298 and 19300.
Created attachment 67420 [details] [review] Bug 19301: Move C4::Reserves::OnShelfHoldsAllowed to get_onshelfholds_policy Following the pattern introduced by bug 19300, we are going to move the OnShelfHoldsAllowed logic to Koha::IssuingRules->get_onshelfholds_policy Test plan: Make sure the onshelfholds policy is correct when placing a hold Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Created attachment 67421 [details] [review] Bug 19301: Remove C4::Reserves::OnShelfHoldsAllowed At this point the subroutine is not used anymore Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
May I suggest to rebase this one on top of 4319 (which has taken quite some time already) ?
Created attachment 69846 [details] [review] Bug 19301: Move C4::Reserves::OnShelfHoldsAllowed to get_onshelfholds_policy Following the pattern introduced by bug 19300, we are going to move the OnShelfHoldsAllowed logic to Koha::IssuingRules->get_onshelfholds_policy Test plan: Make sure the onshelfholds policy is correct when placing a hold Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Created attachment 69847 [details] [review] Bug 19301: Remove C4::Reserves::OnShelfHoldsAllowed At this point the subroutine is not used anymore Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Rebased on top of bug 4319.
QA: Looking here now
Created attachment 70106 [details] [review] Bug 19301: Move C4::Reserves::OnShelfHoldsAllowed to get_onshelfholds_policy Following the pattern introduced by bug 19300, we are going to move the OnShelfHoldsAllowed logic to Koha::IssuingRules->get_onshelfholds_policy Test plan: Make sure the onshelfholds policy is correct when placing a hold Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 70107 [details] [review] Bug 19301: Remove C4::Reserves::OnShelfHoldsAllowed At this point the subroutine is not used anymore Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 70108 [details] [review] Bug 19301: (QA follow-up) Add POD, use statements and correct typo Add POD for new sub in Koha/IssuingRules.pm. Adding use Koha::IssuingRules to opac-detail and opac-MARCdetail. Adding use Koha::Items to opac-detail and opac-MARCdetail. Correct typo $items => $item in opac-MARCdetail.pl. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 70109 [details] [review] Bug 19301: (QA follow-up) Add a few simple tests We removed tests from Reserves.t, but would be nice to test the new sub in IssuingRules.t too. Adding a subtest there. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Pushed to master for 18.05, thanks to everybody involved!