Merge branch 'bug_7919' into 3.12-master

C4/Members/AttributeTypes.pm

@@ -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";

t/Members_AttributeTypes.t

@@ -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' );