https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #1 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Created attachment 78013 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78013&action=edit Bug 21249 - New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patch and run ./updatedatabase.pl in the koha shell 2. Restart memcached and plack 3. In the staff client go to Administration->Global system preferences and search for the systempreference: AdvancedSearchBranchFieldToUse and notice by default it is set to 'homebranch and holdingbranch' 4. Create a library group (if you do not already have one) and add several library branches to the group. 5. Note down the barcode of an item to use for testing searching. Make sure the items homebranch and holdingbranch are different and the items homebranch is a child branch of the library group created in step 4 5. Perform an Advanced search in the staff client and write in the keyword as the barcode of the item and select the library group in the 'Location and availability' section. 6. Submit the search query and notice the item with a homebranch existing in the selected library group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the homebranch value is checked. Also note at the top of the search result page the search query is listed: Results of search with limit(s): '(homebranch: <branch1> or holdingbranch: <branch2> or homebranch: <homebranch1> or holdingbranch: <branch2>)' 7. Now edit the item making sure the homebranch branch is not in the library group, and making sure the holdingbranch is in the library group. This is to test that holdingbranch is indeed being checked when the AdvancedSearchBranchFieldToUse is set to 'AdvancedSearchBranchFieldToUse'. 8. Repeat step 5 and 6 and notice the item with a holdingbranch existing in the selected library group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the holdingbranch is checked. 9. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'holdingbranch' and repeat step 8 and again notice the item with a holdingbranch existing in the selected library group is returned so we know the holdingbranch is being chcked when the 'holdingbranch' value for the syspref is set. Also note the search query at the top of the page is: "Results of search with limit(s): '(holdingbranch: <branch1> or holdingbranch: <branch2>)'" this shows holdingbranch not homebranch is a condition in the query 10. Change the homebranch back to a branch that is in the library group and change the holdingbranch value to a library branch that is not in the library group. 11. Repeat step 5 and 6 and notice the item with the homebranch in the selected library group is returned, so we know the homebranch is being checked when the 'homebranch' value for the syspref is set. Also note the search query at the top of the page is: " Results of search with limit(s): '(homebranch: <branch1> or homebranch: <branch2>)'" this shows homebranch not holdingbranch is a condition in the query. Sponsored-By: Brimbank Library -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #2 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Created attachment 78014 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78014&action=edit Bug 21249 - New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patch and run ./updatedatabase.pl in the koha shell 2. Restart memcached and plack 3. In the staff client go to Administration->Global system preferences and search for the systempreference: AdvancedSearchBranchFieldToUse and notice by default it is set to 'homebranch and holdingbranch' 4. Create a library group (if you do not already have one) and add several library branches to the group. 5. Note down the barcode of an item to use for testing searching. Make sure the items homebranch and holdingbranch are different and the items homebranch is a child branch of the library group created in step 4 5. Perform an Advanced search in the staff client and write in the keyword as the barcode of the item and select the library group in the 'Location and availability' section. 6. Submit the search query and notice the item with a homebranch existing in the selected library group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the homebranch value is checked. Also note at the top of the search result page the search query is listed: Results of search with limit(s): '(homebranch: <branch1> or holdingbranch: <branch2> or homebranch: <homebranch1> or holdingbranch: <branch2>)' 7. Now edit the item making sure the homebranch branch is not in the library group, and making sure the holdingbranch is in the library group. This is to test that holdingbranch is indeed being checked when the AdvancedSearchBranchFieldToUse is set to 'AdvancedSearchBranchFieldToUse'. 8. Repeat step 5 and 6 and notice the item with a holdingbranch existing in the selected library group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the holdingbranch is checked. 9. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'holdingbranch' and repeat step 8 and again notice the item with a holdingbranch existing in the selected library group is returned so we know the holdingbranch is being chcked when the 'holdingbranch' value for the syspref is set. Also note the search query at the top of the page is: "Results of search with limit(s): '(holdingbranch: <branch1> or holdingbranch: <branch2>)'" this shows holdingbranch not homebranch is a condition in the query 10. Change the homebranch back to a branch that is in the library group and change the holdingbranch value to a library branch that is not in the library group. 11. Repeat step 5 and 6 and notice the item with the homebranch in the selected library group is returned, so we know the homebranch is being checked when the 'homebranch' value for the syspref is set. Also note the search query at the top of the page is: " Results of search with limit(s): '(homebranch: <branch1> or homebranch: <branch2>)'" this shows homebranch not holdingbranch is a condition in the query. Sponsored-By: Brimbank Library -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=21174, | |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=21173, | |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=21159 -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=20678 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #3 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Any chance we can move this along? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #4 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Created attachment 78921 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78921&action=edit Bug 21249 - New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patch and run ./updatedatabase.pl in the koha shell 2. Restart memcached and plack 3. In the staff client go to Administration->Global system preferences and search for the systempreference: AdvancedSearchBranchFieldToUse and notice by default it is set to 'homebranch and holdingbranch' 4. Create a library group (if you do not already have one) and add several library branches to the group. 5. Note down the barcode of an item to use for testing searching. Make sure the items homebranch and holdingbranch are different and the items homebranch is a child branch of the library group created in step 4 5. Perform an Advanced search in the staff client and write in the keyword as the barcode of the item and select the library group in the 'Location and availability' section. 6. Submit the search query and notice the item with a homebranch existing in the selected library group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the homebranch value is checked. Also note at the top of the search result page the search query is listed: Results of search with limit(s): '(homebranch: <branch1> or holdingbranch: <branch2> or homebranch: <homebranch1> or holdingbranch: <branch2>)' 7. Now edit the item making sure the homebranch branch is not in the library group, and making sure the holdingbranch is in the library group. This is to test that holdingbranch is indeed being checked when the AdvancedSearchBranchFieldToUse is set to 'AdvancedSearchBranchFieldToUse'. 8. Repeat step 5 and 6 and notice the item with a holdingbranch existing in the selected library group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the holdingbranch is checked. 9. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'holdingbranch' and repeat step 8 and again notice the item with a holdingbranch existing in the selected library group is returned so we know the holdingbranch is being chcked when the 'holdingbranch' value for the syspref is set. Also note the search query at the top of the page is: "Results of search with limit(s): '(holdingbranch: <branch1> or holdingbranch: <branch2>)'" this shows holdingbranch not homebranch is a condition in the query 10. Change the homebranch back to a branch that is in the library group and change the holdingbranch value to a library branch that is not in the library group. 11. Repeat step 5 and 6 and notice the item with the homebranch in the selected library group is returned, so we know the homebranch is being checked when the 'homebranch' value for the syspref is set. Also note the search query at the top of the page is: " Results of search with limit(s): '(homebranch: <branch1> or homebranch: <branch2>)'" this shows homebranch not holdingbranch is a condition in the query. Sponsored-By: Brimbank Library -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Michal Denar <black23@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |black23@gmail.com --- Comment #6 from Michal Denar <black23@gmail.com> --- Hi Alex, I can't select group at poitn 5. http://prntscr.com/lcuq55 Missed I something? Is this setting of group correct? http://prntscr.com/lcuqxf Thank You. Mike -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #7 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Created attachment 82138 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=82138&action=edit Bug 21249: New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patch and run ./updatedatabase.pl in the koha shell 2. Restart memcached and plack 3. In the staff client go to Administration->Global system preferences and search for the systempreference: AdvancedSearchBranchFieldToUse and notice by default it is set to 'homebranch and holdingbranch' 4. Create a library group. Create a subgroup from the library group and add several library branches to the sub group. 5. Note down the barcode of an item to use for testing searching. Make sure the items homebranch and holdingbranch are different and the items homebranch is a child of the sub group created in step 4 6. Perform an Advanced search in the staff client and write in the item barcode as the keyword and select the sub group in the 'Location and availability' section. 7. Submit the search query and notice the item with a homebranch existing in the selected sub group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the homebranch value is checked. Also note at the top of the search result page the search query is listed: Results of search with limit(s): '(homebranch: <branch1> or holdingbranch: <branch2> or homebranch: <homebranch1> or holdingbranch: <branch2>)' 8. Now edit the item making sure the homebranch branch is not in the sub group, and making sure the holdingbranch is in the sub group. This is to test that holdingbranch is indeed being checked when the AdvancedSearchBranchFieldToUse is set to 'homebranch and holdingbranch' 9. Repeat step 6 and notice the item with a holdingbranch existing in the selected library group is returned. 10. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'holdingbranch' and repeat step 6 and again notice the item with a holdingbranch existing in the selected library group is returned. Also note the search query at the top of the page is: "Results of search with limit(s): '(holdingbranch: <branch1> or holdingbranch: <branch2>)'" this shows holdingbranch not homebranch is a condition in the query 11. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'homebranch' 12. Change the item homebranch back to a branch that is in the sub group and change the holdingbranch value to a library branch that is not in the sub group. 13. Repeat step 6 and notice the item with the homebranch in the selected library group is returned, so we know the homebranch is being checked. Also note the search query at the top of the page is: " Results of search with limit(s): '(homebranch: <branch1> or homebranch: <branch2>)'" this shows homebranch not holdingbranch is a condition in the query. Sponsored-By: Brimbank Library -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #9 from Alex Buckley <alexbuckley@catalyst.net.nz> --- I have also amended the test plan in the commit accordingly -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #11 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Created attachment 83518 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=83518&action=edit Bug 21249: Made the SQL INSERT statement idempotent Sponsored-BY: Brimbank Library, Australia -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |marjorie.barry-vila@collect | |o.ca -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #82138|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #14 from sandboxes@biblibre.com <sandboxes@biblibre.com> --- Created attachment 93345 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93345&action=edit Bug 21249: New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patch and run ./updatedatabase.pl in the koha shell 2. Restart memcached and plack 3. In the staff client go to Administration->Global system preferences and search for the systempreference: AdvancedSearchBranchFieldToUse and notice by default it is set to 'homebranch and holdingbranch' 4. Create a library group. Create a subgroup from the library group and add several library branches to the sub group. 5. Note down the barcode of an item to use for testing searching. Make sure the items homebranch and holdingbranch are different and the items homebranch is a child of the sub group created in step 4 6. Perform an Advanced search in the staff client and write in the item barcode as the keyword and select the sub group in the 'Location and availability' section. 7. Submit the search query and notice the item with a homebranch existing in the selected sub group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the homebranch value is checked. Also note at the top of the search result page the search query is listed: Results of search with limit(s): '(homebranch: <branch1> or holdingbranch: <branch2> or homebranch: <homebranch1> or holdingbranch: <branch2>)' 8. Now edit the item making sure the homebranch branch is not in the sub group, and making sure the holdingbranch is in the sub group. This is to test that holdingbranch is indeed being checked when the AdvancedSearchBranchFieldToUse is set to 'homebranch and holdingbranch' 9. Repeat step 6 and notice the item with a holdingbranch existing in the selected library group is returned. 10. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'holdingbranch' and repeat step 6 and again notice the item with a holdingbranch existing in the selected library group is returned. Also note the search query at the top of the page is: "Results of search with limit(s): '(holdingbranch: <branch1> or holdingbranch: <branch2>)'" this shows holdingbranch not homebranch is a condition in the query 11. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'homebranch' 12. Change the item homebranch back to a branch that is in the sub group and change the holdingbranch value to a library branch that is not in the sub group. 13. Repeat step 6 and notice the item with the homebranch in the selected library group is returned, so we know the homebranch is being checked. Also note the search query at the top of the page is: " Results of search with limit(s): '(homebranch: <branch1> or homebranch: <branch2>)'" this shows homebranch not holdingbranch is a condition in the query. Sponsored-By: Brimbank Library Signed-off-by: Amandine Zocca <azocca@ville-montauban.fr> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_19_11_candidate Status|Signed Off |Failed QA CC| |katrin.fischer@bsz-bw.de --- Comment #16 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Alex, some small stuff: 1) The pref name and pref description use 'branch' according to our terminology guidelines 'library' should be used. This would also be consistent with other prefs using 'home library' and 'holding library' (see OPAC results library, OpacLocationOnDetail, ...) 2) The pref description always talks about the advanced search, but I think this applies to the branch selection on the simple search (OpacAddMastheadLibraryPulldown) too or should apply to it to have consistent behaviour - can you clarify? 3) You are missing the change to sysprefs.sql. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93345|0 |1 is obsolete| | Attachment #93346|0 |1 is obsolete| | --- Comment #17 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 95099 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95099&action=edit Bug 21249: New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patch and run ./updatedatabase.pl in the koha shell 2. Restart memcached and plack 3. In the staff client go to Administration->Global system preferences and search for the systempreference: AdvancedSearchBranchFieldToUse and notice by default it is set to 'homebranch and holdingbranch' 4. Create a library group. Create a subgroup from the library group and add several library branches to the sub group. 5. Note down the barcode of an item to use for testing searching. Make sure the items homebranch and holdingbranch are different and the items homebranch is a child of the sub group created in step 4 6. Perform an Advanced search in the staff client and write in the item barcode as the keyword and select the sub group in the 'Location and availability' section. 7. Submit the search query and notice the item with a homebranch existing in the selected sub group is returned. This proves that when the AdvancedSearchBranchFieldToUse syspref is set to 'homebranch and holdingbranch' the homebranch value is checked. Also note at the top of the search result page the search query is listed: Results of search with limit(s): '(homebranch: <branch1> or holdingbranch: <branch2> or homebranch: <homebranch1> or holdingbranch: <branch2>)' 8. Now edit the item making sure the homebranch branch is not in the sub group, and making sure the holdingbranch is in the sub group. This is to test that holdingbranch is indeed being checked when the AdvancedSearchBranchFieldToUse is set to 'homebranch and holdingbranch' 9. Repeat step 6 and notice the item with a holdingbranch existing in the selected library group is returned. 10. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'holdingbranch' and repeat step 6 and again notice the item with a holdingbranch existing in the selected library group is returned. Also note the search query at the top of the page is: "Results of search with limit(s): '(holdingbranch: <branch1> or holdingbranch: <branch2>)'" this shows holdingbranch not homebranch is a condition in the query 11. Change the value of the AdvancedSearchBranchFieldToUse syspref to 'homebranch' 12. Change the item homebranch back to a branch that is in the sub group and change the holdingbranch value to a library branch that is not in the sub group. 13. Repeat step 6 and notice the item with the homebranch in the selected library group is returned, so we know the homebranch is being checked. Also note the search query at the top of the page is: " Results of search with limit(s): '(homebranch: <branch1> or homebranch: <branch2>)'" this shows homebranch not holdingbranch is a condition in the query. Sponsored-By: Brimbank Library Signed-off-by: Amandine Zocca <azocca@ville-montauban.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #19 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 95101 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95101&action=edit Bug 21249: Code cleaning Trying to make the code a bit more readable removing unecessary variables and parenthesis. Code is duplicated but no idea where we could move it to. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_19_11_candidate |rel_20_05_target CC| |martin.renvoize@ptfs-europe | |.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Patch doesn't apply Keywords|rel_20_05_candidate |rel_20_11_target --- Comment #22 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Failed and patch no longer applies.. moving to 20.11 target. I would love to have seen this one looked at early in the 20.05 cycle :( -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95100|0 |1 is obsolete| | --- Comment #24 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 103619 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=103619&action=edit Bug 21249: Made the SQL INSERT statement idempotent Sponsored-BY: Brimbank Library, Australia Signed-off-by: Amandine Zocca <azocca@ville-montauban.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #26 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 103621 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=103621&action=edit Bug 21249: (follow-up) Fixing syspref name, description, get working with OPAC masthead search Syspref is now called SearchLimitLibrary, and the description better explains what the feature does. It works with the advanced search on the staff client and OPAC, and the masthead search on the OPAC when OpacAddMastheadLibraryPulldown is enabled. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|alexbuckley@catalyst.net.nz |aleisha@catalyst.net.nz Change sponsored?|--- |Sponsored Text to go in the| |This patch adds a system release notes| |preference, | |SearchLimitLibrary, to be | |used in the advanced search | |on the staff client and | |OPAC, and the OPAC masthead | |search. When limiting | |search results with a | |library or library group, | |the SearchLimitLibrary | |system preference can be | |set to limit using the | |item's holding branch, home | |branch, or both. CC| |aleisha@catalyst.net.nz Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |andrew@bywatersolutions.com Status|Needs Signoff |Failed QA --- Comment #28 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- This doesn't seem to be working in all cases when picking a specific library rather than a group. - Have an item with homebranch A and holdingbranch B - Set SearchLimitLibrary to home library - search for your barcode, limited to branch A - no results I get the same on the staff client and the OPAC -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #29 from David Cook <dcook@prosentient.com.au> --- (In reply to Aleisha Amohia from comment #25)

Code is duplicated but no idea where we could move it to.

I'd suggest something like Koha::Search or a Koha::Search::Something submodule and then add unit tests for it. It's late on a Friday but I could have more of a think about this one. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #103618|0 |1 is obsolete| | --- Comment #30 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 117220 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=117220&action=edit Bug 21249: New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library or library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patches, update database, restart services 2. Set up a record with one item. Edit the item so that: home branch = Branch A holding/current branch = Branch B. Note the barcode of your item. 3. Go to Administration -> Library Groups. Create a library group that only contains Branch A. = homebranch and holdingbranch = 4. Go to Administration -> System preferences and find the new SearchLimitLibrary syspref. Confirm it is set to 'homebranch and holdingbranch' by default. Keep this tab open. 5. Go to Advanced Search in the staff client in another tab. Under 'location and availability', select your library group from the dropdown. Under 'search for', select the barcode option and enter your item's barcode. 6. Submit the search and confirm you are taken to your item as expected. 7. Go back to Advanced Search. Under 'location and availability', select Branch A from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 8. Submit the search and confirm you are taken to your item as expected. 9. Go back to Advanced Search. Under 'location and availability', select Branch B from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 10. Submit the search and confirm you are taken to your item as expected. = homebranch only = 11. Go back to your System preferences tab. Set the SearchLimitLibrary syspref to 'homebranch'. keep this tab open. 12. Go to Advanced Search in the staff client in another tab. Under 'location and availability', select your library group from the dropdown. Under 'search for', select the barcode option and enter your item's barcode. 13. Submit the search and confirm you are taken to your item as expected, because the syspref is set to homebranch and the library group contains our item's homebranch. 14. Go back to Advanced Search. Under 'location and availability', select Branch A from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 15. Submit the search and confirm you are taken to your item as expected. 16. Go back to Advanced Search. Under 'location and availability', select Branch B from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 17. Submit the search and confirm you are NOT taken to your item and your item does not show in the search results. = holdingbranch only = 18. Go back to your System preferences tab. Set the SearchLimitLibrary syspref to 'holdingbranch'. keep this tab open. 19. Go to Advanced Search in the staff client in another tab. Under 'location and availability', select your library group from the dropdown. Under 'search for', select the barcode option and enter your item's barcode. 20. Submit the search and confirm you are NOT taken to your item and your item does not show in the search results, because the syspref is set to holdingbranch and the library group does not contain our item's holdingbranch. 21. Go back to Advanced Search. Under 'location and availability', select Branch B from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 22. Submit the search and confirm you are taken to your item as expected. 23. Go back to Advanced Search. Under 'location and availability', select Branch A from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 24. Submit the search and confirm you are NOT taken to your item and your item does not show in the search results. 25. Repeat the above test plan but do your searching with the OPAC advanced search. Sponsored-By: Brimbank Library Signed-off-by: Amandine Zocca <azocca@ville-montauban.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #103620|0 |1 is obsolete| | --- Comment #32 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 117222 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=117222&action=edit Bug 21249: Code cleaning Trying to make the code a bit more readable removing unecessary variables and parenthesis. Code is duplicated but no idea where we could move it to. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #34 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 117224 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=117224&action=edit Bug 21249: (follow-up) Implement SearchLibraryLimit for individual library before this patch, the limit only applies to groups of libraries -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #36 from David Cook <dcook@prosentient.com.au> --- "home library and holding library" doesn't work for individual libraries. It's generating the following PQF: @attrset Bib-1 @or @and @attr 1=8023 @attr 4=6 @attr 5=1 @attr 2=102 39999000001310 @attr 1=homebranch CPL @attr 1=8012 CPL The Library Group option generates the following which is correct: @attrset Bib-1 @and @attr 1=8023 @attr 4=6 @attr 5=1 @attr 2=102 39999000001310 @or @attr 1=homebranch CPL @attr 1=8012 CPL The key is the parentheses in your query. For the group you're doing this: "(%s or %s)" For the individual you're doing this: "$homebranchlimit or $holdingbranchlimit" If you change that last one to the following it should work: "($homebranchlimit or $holdingbranchlimit)" -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #37 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 120481 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120481&action=edit Bug 21249: (follow-up) Adding parentheses to fix query -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #117221|0 |1 is obsolete| | --- Comment #39 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 120568 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120568&action=edit Bug 21249: Made the SQL INSERT statement idempotent Sponsored-BY: Brimbank Library, Australia Signed-off-by: Amandine Zocca <azocca@ville-montauban.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #117223|0 |1 is obsolete| | --- Comment #41 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 120570 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120570&action=edit Bug 21249: (follow-up) Fixing syspref name, description, get working with OPAC masthead search Syspref is now called SearchLimitLibrary, and the description better explains what the feature does. It works with the advanced search on the staff client and OPAC, and the masthead search on the OPAC when OpacAddMastheadLibraryPulldown is enabled. Sponsored-by: Catalyst IT Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #120481|0 |1 is obsolete| | --- Comment #43 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 120572 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120572&action=edit Bug 21249: (follow-up) Adding parentheses to fix query Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 --- Comment #45 from David Cook <dcook@prosentient.com.au> --- I am getting 1 fail in the QA tools but it seems minor to me. I'm leaving it to the RM to squash if necessary. -- root@kohadevbox:koha(bug_21249)$ qa testing 6 commit(s) (applied to 640ba47 'cf Bug 28288: Prevent XSISBN.t to fai') Processing files before patches |========================>| 4 / 4 (100.00%) Processing files after patches |========================>| 4 / 4 (100.00%) OK catalogue/search.pl FAIL installer/data/mysql/atomicupdate/bug_21249-Branch_to_limit_advanced_search_results.sql FAIL git manipulation The file has been added and deleted in the same patchset OK installer/data/mysql/mandatory/sysprefs.sql OK opac/opac-search.pl Processing additional checks OK! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #120567|0 |1 is obsolete| | --- Comment #46 from David Cook <dcook@prosentient.com.au> --- Created attachment 120575 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120575&action=edit Bug 21249: New syspref controlling branch fields queried against selected library group value in advanced search This commit allows librarians to choose whether they want to query the homebranch, holdingbranch or homebranch AND holdingbranch when they set a library or library group search condition in the staff client and OPAC advanced searches. Test plan: 1. Apply patches, update database, restart services 2. Set up a record with one item. Edit the item so that: home branch = Branch A holding/current branch = Branch B. Note the barcode of your item. 3. Go to Administration -> Library Groups. Create a library group that only contains Branch A. = homebranch and holdingbranch = 4. Go to Administration -> System preferences and find the new SearchLimitLibrary syspref. Confirm it is set to 'homebranch and holdingbranch' by default. Keep this tab open. 5. Go to Advanced Search in the staff client in another tab. Under 'location and availability', select your library group from the dropdown. Under 'search for', select the barcode option and enter your item's barcode. 6. Submit the search and confirm you are taken to your item as expected. 7. Go back to Advanced Search. Under 'location and availability', select Branch A from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 8. Submit the search and confirm you are taken to your item as expected. 9. Go back to Advanced Search. Under 'location and availability', select Branch B from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 10. Submit the search and confirm you are taken to your item as expected. = homebranch only = 11. Go back to your System preferences tab. Set the SearchLimitLibrary syspref to 'homebranch'. keep this tab open. 12. Go to Advanced Search in the staff client in another tab. Under 'location and availability', select your library group from the dropdown. Under 'search for', select the barcode option and enter your item's barcode. 13. Submit the search and confirm you are taken to your item as expected, because the syspref is set to homebranch and the library group contains our item's homebranch. 14. Go back to Advanced Search. Under 'location and availability', select Branch A from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 15. Submit the search and confirm you are taken to your item as expected. 16. Go back to Advanced Search. Under 'location and availability', select Branch B from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 17. Submit the search and confirm you are NOT taken to your item and your item does not show in the search results. = holdingbranch only = 18. Go back to your System preferences tab. Set the SearchLimitLibrary syspref to 'holdingbranch'. keep this tab open. 19. Go to Advanced Search in the staff client in another tab. Under 'location and availability', select your library group from the dropdown. Under 'search for', select the barcode option and enter your item's barcode. 20. Submit the search and confirm you are NOT taken to your item and your item does not show in the search results, because the syspref is set to holdingbranch and the library group does not contain our item's holdingbranch. 21. Go back to Advanced Search. Under 'location and availability', select Branch B from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 22. Submit the search and confirm you are taken to your item as expected. 23. Go back to Advanced Search. Under 'location and availability', select Branch A from the individual libraries dropdown. Under 'search for', select the barcode option and enter your item's barcode. 24. Submit the search and confirm you are NOT taken to your item and your item does not show in the search results. 25. Repeat the above test plan but do your searching with the OPAC advanced search. Sponsored-By: Brimbank Library Signed-off-by: Amandine Zocca <azocca@ville-montauban.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> Signed-off-by: David Cook <dcook@prosentient.com.au> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #120569|0 |1 is obsolete| | --- Comment #48 from David Cook <dcook@prosentient.com.au> --- Created attachment 120577 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120577&action=edit Bug 21249: Code cleaning Trying to make the code a bit more readable removing unecessary variables and parenthesis. Code is duplicated but no idea where we could move it to. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> Signed-off-by: David Cook <dcook@prosentient.com.au> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #120571|0 |1 is obsolete| | --- Comment #50 from David Cook <dcook@prosentient.com.au> --- Created attachment 120579 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120579&action=edit Bug 21249: (follow-up) Implement SearchLibraryLimit for individual library before this patch, the limit only applies to groups of libraries Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> Signed-off-by: David Cook <dcook@prosentient.com.au> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |dcook@prosentient.com.au |y.org | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |28295 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28295 [Bug 28295] SearchLimitLibrary related code must be moved to a module -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |21.05.00 released in| | Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m --- Comment #55 from Fridolin Somers <fridolin.somers@biblibre.com> --- Nice. Just, preference description seems incorect : both: "home library and holding library." https://git.koha-community.org/Koha-community/Koha/src/commit/21658717de3d8d... is should be "home library or holding library." no ? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |28847 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28847 [Bug 28847] Branch limits while searching should be expanded in query building and not in CGI -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21249 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |30814 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30814 [Bug 30814] Remove search alias branch obsolete since bug 21249 -- You are receiving this mail because: You are watching all bug changes.