http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=9367, | |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=10663 -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl --- Comment #1 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Katrin Fischer from comment #0)

The GetReserveStatus subroutine doesn't cover all needed use cases and the change done by bug 9367 need to be reverted for that reason.

Do you have more specific information? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Ah I see now, that I got a little confused - Waiting works fine, which is why the patch here won't make much difference in most cases. I still think reverting is the safer option and maybe we should just remove GetReserveStatus and instead create something new and light weight that just checks for the 'Waiting' status. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 --- Comment #5 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 20165 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20165&action=edit Bug 10697: Revert from using GetReserveStatus to use CheckReserves Patch reverts switch from CheckReserves to GetReserveStatus done by 9367 in various places. Note: You will need the patches from bug 10663 to check renewal related functionality. Note: When the check is only done for "Waiting" it will work the same before and after applying this patch as this part of GetReserveStatus works fine. In order to test this, create item and title level holds on some records, make sure that there are holds not yet pulled and items waiting for pickup in the library. Search.pm - searchResult XSLT.pm - buildKohaItemsNamespace Check item status in search result list are shown correctly using XSLT and non-XSLT views. Only checked for 'Waiting', so verify no regressions. opac-detail.pl Check on item status is shown correctly on detail pages in OPAC. if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; } seems to be not used, verify no regressions. circulation.pl - build_issue_data opac-user.pl Check items on hold are properly marked in the list of checkouts and can not be renewed for - patron account pages in the staff interface - patron account pages in the OPAC $it->{'renew_error'} = ( $restype eq "Waiting" or $restype eq "Reserved" ) ? 1 : 0; seems to be not used, verify no regressions. Run unit tests from first patch and any additional tests you can think of. Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 --- Comment #6 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- I know that more tests contain references to patron type S and home branch MPL but if my test database does not contain them, these kind of tests will always fail.. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |gitbot@bugs.koha-community. | |org --- Comment #8 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 10697 - Adding more unit tests to CheckReserves Using index info to reconstruct a base tree... M t/db_dependent/Reserves.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Reserves.t CONFLICT (content): Merge conflict in t/db_dependent/Reserves.t Patch failed at 0001 Bug 10697 - Adding more unit tests to CheckReserves The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 --- Comment #9 from Chris Cormack <chris@bigballofwax.co.nz> --- I had a go at resolving this conflict, but can't, Katrin can you take a look please -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 --- Comment #11 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I think this needs to be redone probably... should we put a big fat NOTE in the docs of GetReserveStatus meanwhile? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10697 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtompset@hotmail.com --- Comment #12 from M. Tompsett <mtompset@hotmail.com> --- Scary! -- You are receiving this mail because: You are watching all bug changes.