Created attachment 46593 [details] [review] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. Created attachment 46661 [details] [review] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. This patch also replaces a call to the removed method C4::Branches::GetBranchesCoutn with a call to Koha::Libraries->search-count Created attachment 46662 [details] [review] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. This patch also replaces a call to the removed method C4::Branches::GetBranchesCoutn with a call to Koha::Libraries->search-count Created attachment 46664 [details] [review] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 46665 [details] [review] Bug 15568 (Follow up) Replace call to C4::Branches::GetBranchesCount with Koha::Libraries->search->count Created attachment 46679 [details] ^# Attachment to Bug 15568 - Circ rules are not displayed anymore [SIGNED-OFF] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Sorry, I'm not really sure what I just did, but I was meant to be signing off on both patches. I have submitted a patch on bug 14295 to remove the GetBranchesCount occurrences. Created attachment 46685 [details] [review] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Nick, I have moved the GetBranchesCount changes as a followup of bug 14295 (because there are 2 occurrences to fix). So I mark this fix as dependent on it and switch back to needs signoff. Sorry for the additional work. Created attachment 46697 [details] [review] [SIGNED-OFF] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Hm, dependencies are pushed to master, but patch doesn't apply for me: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15568: Fix display default circ rules fatal: sha1 information is lacking or useless (admin/smart-rules.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. (In reply to Katrin Fischer from comment #12) > Hm, dependencies are pushed to master, but patch doesn't apply for me: You must apply the last patch on bug 15295, not pushed to master yet. [SIGNED-OFF] Bug 15295: (follow-up) Koha::Libraries - Remove GetBranchesCount Tricky! Created attachment 46827 [details] [review] [PASSED QA] Bug 15568: Fix display default circ rules To reproduce: Go on the admin circ rules page (admin/smart-rules.pl), switch the dropdown list from specific to "all libraries". The rules are not displayed anymore. Test plan: Apply this patch and confirm that the rules are now displayed correctly. Make sure the enh introduced by bug 11625 is not broken. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Pushed to master, thanks for your work! This bug does not concern stable versions, changing status to RESOLVED |
When changing the library from specific to all, the rules are not displayed anymore on the circ rules admin table. git bisect blames: commit 83e913f8c26a815019ffde21524cc7f126357d57 Bug 11625 - Implement DefaultToLoggedInLibraryCircRules