[Bug 15295] New: Move the C4::Branch related code to Koha::Libraries - part 2
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Bug ID: 15295 Summary: Move the C4::Branch related code to Koha::Libraries - part 2 Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: jonathan.druart@bugs.koha-community.org Reporter: jonathan.druart@bugs.koha-community.org QA Contact: testopia@bugs.koha-community.org Blocks: 15293 In this second part, the following subroutines from C4::Branch will be removed by using methods from Koha::Libraries. - DelBranch - DelBranchCategory - CheckCategoryUnique - CheckBranchCategorycode - GetBranchCategory - GetBranchCategories - GetCategoryTypes - GetBranchesCount - ModBranchCategoryInfo Referenced Bugs: http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15293 [Bug 15293] Move the C4::Branch related code to Koha::Libraries -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #1 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45368 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45368&action=edit Bug 15295: Koha::Libraries - Remove DelBranch and DelBranchCategory These 2 subroutines are not used anymore, there were only used from the admin script rewrote on bug 15294. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #2 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45369 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45369&action=edit Bug 15295: Koha::Libraries - Remove CheckCategoryUnique This subroutine is not used anymore and was not really useful. The branchcategories table has a primary key defined on categorycode. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #3 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45370 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45370&action=edit Bug 15295: Koha::Libraries - Remove CheckBranchCategorycode This verification is now done in admin/branches.pl, no need for a special subroutine/method, it's 1 line only called once. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #4 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45371 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45371&action=edit Bug 15295: Koha::Libraries - Remove GetBranchCategory This has been replaced with Koha::Libraries->find -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #5 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45372 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45372&action=edit Bug 15295: Koha::Libraries - Remove GetBranchCategories Test plan 1/ enable OpacAddMastheadLibraryPulldown 2/ Defined a group of libraries as searchdomain and tick 'show in pull down' 3/ At the OPAC, go on the advanced search form, limit by the group of libraries you have just created. 4/ The group should be selected by default in the dropdown list -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #6 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45373 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45373&action=edit Bug 15295: Koha::Libraries - Remove GetCategoryTypes 'searchdomain' and 'properties' were hardcoded in this subroutine. Now there are in the admin script. Not a big deal, we could improve that later if someone wants to add a third values. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #7 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45374 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45374&action=edit Bug 15295: Koha::Libraries - Remove GetBranchesCount This is replaced with Koha::Libraries->search->count. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #8 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 45375 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45375&action=edit Bug 15295! Koha::Libraries - Remove ModBranchCategoryInfo This has been replaced with Koha::Library->update_categories and Koha::Library->add_to_categories -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |15294 Referenced Bugs: http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15294 [Bug 15294] Move the C4::Branch related code to Koha::Libraries - part 1 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #9 from Marc Véron <veron@veron.ch> --- Created attachment 45752 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45752&action=edit Bug 15294: Koha::Libraries - Rewrite the admin scripts This patch rewrites the admin/branches.pl script to use the new modules instead of C4::Branches. Test plan: 1/ Create libraries using all the fields available 2/ Create groups of libraries 3/ Assign 1+ libraries to some groups 4/ Delete libraries and groups of libraries You should not able to delete a library if items or patrons use it. You should not able to delete a group of libraries if there are still libraries using it. 5/ Update libraries and groups of libraries Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch Attachment #45752|0 |1 is obsolete| | --- Comment #10 from Marc Véron <veron@veron.ch> --- Comment on attachment 45752 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45752 Bug 15294: Koha::Libraries - Rewrite the admin scripts Sorry, that was an error, I tried to attach multiple patches. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45368|0 |1 is obsolete| | --- Comment #11 from Marc Véron <veron@veron.ch> --- Created attachment 45754 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45754&action=edit Bug 15295: Koha::Libraries - Remove DelBranch and DelBranchCategory These 2 subroutines are not used anymore, there were only used from the admin script rewrote on bug 15294. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45369|0 |1 is obsolete| | --- Comment #12 from Marc Véron <veron@veron.ch> --- Created attachment 45755 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45755&action=edit Bug 15295: Koha::Libraries - Remove CheckCategoryUnique This subroutine is not used anymore and was not really useful. The branchcategories table has a primary key defined on categorycode. Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45370|0 |1 is obsolete| | --- Comment #13 from Marc Véron <veron@veron.ch> --- Created attachment 45756 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45756&action=edit Bug 15295: Koha::Libraries - Remove CheckBranchCategorycode This verification is now done in admin/branches.pl, no need for a special subroutine/method, it's 1 line only called once. Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45371|0 |1 is obsolete| | --- Comment #14 from Marc Véron <veron@veron.ch> --- Created attachment 45757 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45757&action=edit Bug 15295: Koha::Libraries - Remove GetBranchCategory This has been replaced with Koha::Libraries->find Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45372|0 |1 is obsolete| | --- Comment #15 from Marc Véron <veron@veron.ch> --- Created attachment 45760 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45760&action=edit Bug 15295: Koha::Libraries - Remove GetBranchCategories Test plan 1/ enable OpacAddMastheadLibraryPulldown 2/ Defined a group of libraries as searchdomain and tick 'show in pull down' 3/ At the OPAC, go on the advanced search form, limit by the group of libraries you have just created. 4/ The group should be selected by default in the dropdown list Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45373|0 |1 is obsolete| | --- Comment #16 from Marc Véron <veron@veron.ch> --- Created attachment 45763 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45763&action=edit Bug 15295: Koha::Libraries - Remove GetCategoryTypes 'searchdomain' and 'properties' were hardcoded in this subroutine. Now there are in the admin script. Not a big deal, we could improve that later if someone wants to add a third values. Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45374|0 |1 is obsolete| | --- Comment #17 from Marc Véron <veron@veron.ch> --- Created attachment 45764 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45764&action=edit Bug 15295: Koha::Libraries - Remove GetBranchesCount This is replaced with Koha::Libraries->search->count. Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45375|0 |1 is obsolete| | --- Comment #18 from Marc Véron <veron@veron.ch> --- Created attachment 45765 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45765&action=edit Bug 15295! Koha::Libraries - Remove ModBranchCategoryInfo This has been replaced with Koha::Library->update_categories and Koha::Library->add_to_categories -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #19 from Marc Véron <veron@veron.ch> --- Note: I tested all patches together. Worked as expected. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #20 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Marc Véron from comment #19)
Note: I tested all patches together. Worked as expected.
And that is exactly the way to do. I add a test plan on the patch to highlight the changes done for each one, but they have to be tested together. Thanks a lot for testing and signoffing! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45754|0 |1 is obsolete| | --- Comment #21 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45924 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45924&action=edit Bug 15295: Koha::Libraries - Remove DelBranch and DelBranchCategory These 2 subroutines are not used anymore, there were only used from the admin script rewrote on bug 15294. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45755|0 |1 is obsolete| | --- Comment #22 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45925 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45925&action=edit Bug 15295: Koha::Libraries - Remove CheckCategoryUnique This subroutine is not used anymore and was not really useful. The branchcategories table has a primary key defined on categorycode. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> http://bugs.koha-community.org/show_bug.cgi?id=15294 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45756|0 |1 is obsolete| | --- Comment #23 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45926 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45926&action=edit Bug 15295: Koha::Libraries - Remove CheckBranchCategorycode This verification is now done in admin/branches.pl, no need for a special subroutine/method, it's 1 line only called once. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> http://bugs.koha-community.org/show_bug.cgi?id=15294 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45757|0 |1 is obsolete| | --- Comment #24 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45927 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45927&action=edit Bug 15295: Koha::Libraries - Remove GetBranchCategory This has been replaced with Koha::Libraries->find Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> http://bugs.koha-community.org/show_bug.cgi?id=15294 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45760|0 |1 is obsolete| | --- Comment #25 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45928 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45928&action=edit Bug 15295: Koha::Libraries - Remove GetBranchCategories Test plan 1/ enable OpacAddMastheadLibraryPulldown 2/ Defined a group of libraries as searchdomain and tick 'show in pull down' 3/ At the OPAC, go on the advanced search form, limit by the group of libraries you have just created. 4/ The group should be selected by default in the dropdown list Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> http://bugs.koha-community.org/show_bug.cgi?id=15294 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45763|0 |1 is obsolete| | --- Comment #26 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45929 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45929&action=edit Bug 15295: Koha::Libraries - Remove GetCategoryTypes 'searchdomain' and 'properties' were hardcoded in this subroutine. Now there are in the admin script. Not a big deal, we could improve that later if someone wants to add a third values. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> http://bugs.koha-community.org/show_bug.cgi?id=15294 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45764|0 |1 is obsolete| | --- Comment #27 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45930 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45930&action=edit Bug 15295: Koha::Libraries - Remove GetBranchesCount This is replaced with Koha::Libraries->search->count. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> http://bugs.koha-community.org/show_bug.cgi?id=15294 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45765|0 |1 is obsolete| | --- Comment #28 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 45931 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45931&action=edit Bug 15295! Koha::Libraries - Remove ModBranchCategoryInfo This has been replaced with Koha::Library->update_categories and Koha::Library->add_to_categories Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> http://bugs.koha-community.org/show_bug.cgi?id=15294 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA CC| |martin.renvoize@ptfs-europe | |.com --- Comment #29 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- More foundational work, well done Jonathan. Not found any regressions and code is much tidier now :) Passing QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |4941 Referenced Bugs: http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4941 [Bug 4941] Can't set branch in staff client when singleBranchMode is enabled -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Brendan Gallagher <brendan@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |brendan@bywatersolutions.co | |m --- Comment #30 from Brendan Gallagher <brendan@bywatersolutions.com> --- Pushed to Master - Should be in the May 2016 release -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 --- Comment #31 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 46684 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=46684&action=edit Bug 15295: (follow-up) Koha::Libraries - Remove GetBranchesCount Fix conflict with bug 11625 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |15568 Referenced Bugs: http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15568 [Bug 15568] Circ rules are not displayed anymore -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #46684|0 |1 is obsolete| | --- Comment #32 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 46696 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=46696&action=edit [SIGNED-OFF] Bug 15295: (follow-up) Koha::Libraries - Remove GetBranchesCount Fix conflict with bug 11625 Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15295 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com --- Comment #33 from Kyle M Hall <kyle@bywatersolutions.com> --- Follow pushed to master! -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org