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

Revert "Bug 37870: Fix sort order of class sources" 

This reverts commit 6cbe190092.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Lucas Gass 2024-12-05 16:33:22 +00:00
parent 15734ad2c3
commit e1c2cf1b6b
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Koha/UI/Form/Builder/Biblio.pm
View File

@ -16,8 +16,6 @@ package Koha::UI::Form::Builder::Biblio;
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
use feature qw(fc);
use C4::Context;
use C4::ClassSource qw( GetClassSources );
use Koha::DateUtils qw( dt_from_string );
@ -332,7 +330,7 @@ sub build_authorized_values_list {
my $default_source = C4::Context->preference("DefaultClassificationSource");
foreach my $class_source (sort {fc($a) cmp fc($b)} keys %$class_sources) {
foreach my $class_source (sort keys %$class_sources) {
next unless $class_sources->{$class_source}->{'used'} or
($value and $class_source eq $value) or
($class_source eq $default_source);

4
Koha/UI/Form/Builder/Item.pm
View File

@ -16,10 +16,8 @@ package Koha::UI::Form::Builder::Item;
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
use feature qw(fc);
use List::Util qw( any );
use MARC::Record;
use C4::Context;
use C4::Biblio qw( GetFrameworkCode GetMarcStructure IsMarcStructureInternal );
use C4::Koha qw( GetAuthorisedValues );
@ -244,7 +242,7 @@ sub generate_subfield_form {
my $default_source =
C4::Context->preference("DefaultClassificationSource");
foreach my $class_source (sort {fc($a) cmp fc($b)} keys %$class_sources) {
foreach my $class_source ( sort keys %$class_sources ) {
next
unless $class_sources->{$class_source}->{'used'}
or ( $value and $class_source eq $value )

12
t/db_dependent/Koha/UI/Form/Builder/Biblio.t
View File

@ -138,13 +138,13 @@ subtest 'generate_subfield_form class sources' => sub {
},
);
my @class_sources = Koha::ClassSources->search( { used => 1 }, { order_by => 'cn_source' } )->as_list;
my %labels = map { $_->cn_source => $_->description } @class_sources;
my @values = ( '', map { $_->cn_source } @class_sources );
my @class_sources = Koha::ClassSources->search({used => 1}, {order_by => 'cn_source'})->as_list;
my %labels = map { $_->cn_source => $_->description } @class_sources;
my @values = ('', map { $_->cn_source } @class_sources);
is( $subfield->{marc_value}->{type}, 'select' );
is_deeply( $subfield->{marc_value}->{labels}, \%labels );
is_deeply( $subfield->{marc_value}->{values}, \@values );
is($subfield->{marc_value}->{type}, 'select');
is_deeply($subfield->{marc_value}->{labels}, \%labels);
is_deeply($subfield->{marc_value}->{values}, \@values);
};
subtest 'generate_subfield_form authorised value' => sub {

21
t/db_dependent/Koha/UI/Form/Builder/Item.t
View File

@ -23,7 +23,6 @@ use utf8;
use List::MoreUtils qw( uniq );
use Koha::ClassSources;
use Koha::Libraries;
use Koha::MarcSubfieldStructures;
use Koha::UI::Form::Builder::Item;
@ -100,16 +99,16 @@ subtest 'authorised values' => sub {
};
subtest 'cn_source' => sub {
plan tests => 3;
my ($subfield) = grep { $_->{kohafield} eq 'items.cn_source' } @$subfields;
my @class_sources = Koha::ClassSources->search( { used => 1 }, { order_by => 'cn_source' } )->as_list;
my %labels = map { $_->cn_source => $_->description } @class_sources;
my @values = ( '', map { $_->cn_source } @class_sources );
is( $subfield->{marc_value}->{type}, 'select' );
is_deeply( $subfield->{marc_value}->{labels}, \%labels );
is_deeply( $subfield->{marc_value}->{values}, \@values );
plan tests => 2;
my ( $subfield ) = grep { $_->{kohafield} eq 'items.cn_source' } @$subfields;
is_deeply( $subfield->{marc_value}->{values}, [ '', 'ddc', 'lcc' ] );
is_deeply(
$subfield->{marc_value}->{labels},
{
ddc => "Dewey Decimal Classification",
lcc => "Library of Congress Classification",
}
);
};
subtest 'branches' => sub {
plan tests => 2;