https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19302
Hayley Mapley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #9 from Hayley Mapley <[email protected]> --- (In reply to Jonathan Druart from comment #8) > Created attachment 88660 [details] [review] > Bug 19302: Send koha::objects to C4::Reserves::IsAvailableForItemLevelRequest > > Almost everywhere we call IsAvailableForItemLevelRequest we already have > a Koha::Patron and Koha::Item object. It makes sense to use them to > avoid a refetch > > Test plan: > It would be good to test this patch on top of 19300 and 19301 and make > sure everything works as expected Sorry Jonathan, still has merge conflicts Applying: Bug 19302: Send koha::objects to C4::Reserves::IsAvailableForItemLevelRequest Using index info to reconstruct a base tree... M C4/Circulation.pm M C4/Reserves.pm M t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t CONFLICT (content): Merge conflict in t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 19302: Send koha::objects to C4::Reserves::IsAvailableForItemLevelRequest -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
