gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15629: Koha::Libraries - Remove GetBranchesInCategory (1) 

For consistency, the branchcodes method of Koha::LibraryCategory should be
named libraries.
At the moment, there is only one occurrence, in admin/branches.pl

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
This commit is contained in:
Jonathan Druart 2016-01-20 11:21:12 +00:00 committed by Brendan Gallagher
parent 07f85e7f88
commit d6651ab949
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Koha/LibraryCategory.pm
View File

@ -41,7 +41,7 @@ sub new {
return $self->SUPER::new( $params );
}
sub branchcodes{
sub libraries{
my ( $self, $params ) = @_;
# TODO This should return Koha::Libraries
return $self->{_result}->branchcodes( $params );

2
admin/branches.pl
View File

@ -194,7 +194,7 @@ if ( $op eq 'add_form' ) {
$op = 'list';
} elsif ( $op eq 'delete_confirm_category' ) {
my $category = Koha::LibraryCategories->find($categorycode);
if ( my $libraries_count = scalar( $category->branchcodes ) ) {
if ( my $libraries_count = scalar( $category->libraries ) ) {
push @messages,
{ type => 'error',
code => 'cannot_delete_category',

2
t/db_dependent/Koha/Libraries.t
View File

@ -77,7 +77,7 @@ $retrieved_library_1->update_categories( [ $new_category_2, $new_category_3 ] );
is( Koha::Libraries->find( $new_library_1->branchcode )->get_categories->count, 2, '2 libraries should have been linked to the category 2' );
my $retrieved_category_2 = Koha::LibraryCategories->find( $new_category_2->categorycode );
is( $retrieved_category_2->branchcodes->count, 2, '2 libraries should have been linked to the category_2' );
is( $retrieved_category_2->libraries->count, 2, '2 libraries should have been linked to the category_2' );
is( $retrieved_category_2->categorycode, uc('my_cc_2'), 'The Koha::LibraryCategory constructor should have upercased the categorycode' );
$retrieved_library_1->delete;