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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
This commit is contained in:
Jonathan Druart 2015-12-03 14:42:11 +00:00 committed by Brendan Gallagher
parent 141200794d
commit 5881da0bb4
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
C4/Branch.pm
View File

@ -37,7 +37,6 @@ BEGIN {
&get_branchinfos_of
&ModBranch
&GetBranchInfo
&GetCategoryTypes
&GetBranchesInCategory
&ModBranchCategoryInfo
&mybranch
@ -283,24 +282,6 @@ sub ModBranch {
}
}
=head2 GetCategoryTypes
$categorytypes = GetCategoryTypes;
returns a list of category types.
Currently these types are HARDCODED.
type: 'searchdomain' defines a group of agencies that the calling library may search in.
Other usage of agency categories falls under type: 'properties'.
to allow for other uses of categories.
The searchdomain bit may be better implemented as a separate module, but
the categories were already here, and minimally used.
=cut
#TODO manage category types. rename possibly to 'agency domains' ? as borrowergroups are called categories.
sub GetCategoryTypes {
return ( 'searchdomain','properties');
}
=head2 GetBranch
$branch = GetBranch( $query, $branches );

7
t/db_dependent/Branch.t
View File

@ -21,7 +21,7 @@ use Modern::Perl;
use C4::Context;
use Data::Dumper;
use Test::More tests => 24;
use Test::More tests => 23;
use C4::Branch;
use Koha::Libraries;
@ -42,7 +42,6 @@ can_ok(
get_branchinfos_of
ModBranch
GetBranchInfo
GetCategoryTypes
GetBranchesInCategory
ModBranchCategoryInfo
mybranch
@ -293,10 +292,6 @@ $brCat1 = GetBranchesInCategory( $cat1->{categorycode} );
push( @b, $b3->{branchcode} );
is_deeply( $brCat1, \@b, 'CAT1 has branch BRB and BRC' );
#Test GetCategoryTypes
my @category_types = GetCategoryTypes();
is_deeply(\@category_types, [ 'searchdomain', 'properties' ], 'received expected library category types');
#TODO later: test mybranchine and onlymine
# Actually we cannot mock C4::Context->userenv in unit tests