Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_7919' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2012-12-07 18:30:36 -05:00
commit 1b91dbdc29
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
C4/Members/AttributeTypes.pm
View file

@ -74,7 +74,7 @@ sub GetAttributeTypes {
my $branch_limit = $no_branch_limit
? 0
: C4::Context->userenv ? C4::Context->userenv->{"branch"} : 0;
my $select = $all ? '*' : 'DISTINCT(code), description';
my $select = $all ? '*' : 'DISTINCT(code), description, class';
my $dbh = C4::Context->dbh;
my $query = "SELECT $select FROM borrower_attribute_types";

2
t/Members_AttributeTypes.t
View file

@ -37,7 +37,7 @@ my $dbh = C4::Context->dbh();
$dbh->{mock_add_resultset} = $members_attributetypes;
my @members_attributetypes = C4::Members::AttributeTypes::GetAttributeTypes();
my @members_attributetypes = C4::Members::AttributeTypes::GetAttributeTypes(undef, 1);
is( $members_attributetypes[0]->{'code'}, 'one', 'First code value is one' );