View | Details | Raw Unified | Return to bug 37870
Collapse All | Expand All

(-)a/Koha/UI/Form/Builder/Biblio.pm (-1 / +3 lines)
Lines 16-21 package Koha::UI::Form::Builder::Biblio; Link Here
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
use feature qw(fc);
20
19
use C4::Context;
21
use C4::Context;
20
use C4::ClassSource qw( GetClassSources );
22
use C4::ClassSource qw( GetClassSources );
21
use Koha::DateUtils qw( dt_from_string );
23
use Koha::DateUtils qw( dt_from_string );
Lines 333-339 sub build_authorized_values_list { Link Here
333
335
334
        my $default_source = C4::Context->preference("DefaultClassificationSource");
336
        my $default_source = C4::Context->preference("DefaultClassificationSource");
335
337
336
        foreach my $class_source (sort keys %$class_sources) {
338
        foreach my $class_source (sort {fc($a) cmp fc($b)} keys %$class_sources) {
337
            next unless $class_sources->{$class_source}->{'used'} or
339
            next unless $class_sources->{$class_source}->{'used'} or
338
                        ($value and $class_source eq $value) or
340
                        ($value and $class_source eq $value) or
339
                        ($class_source eq $default_source);
341
                        ($class_source eq $default_source);
(-)a/Koha/UI/Form/Builder/Item.pm (-1 / +3 lines)
Lines 16-23 package Koha::UI::Form::Builder::Item; Link Here
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
use feature qw(fc);
19
use List::Util qw( any );
20
use List::Util qw( any );
20
use MARC::Record;
21
use MARC::Record;
22
21
use C4::Context;
23
use C4::Context;
22
use C4::Biblio qw( GetFrameworkCode GetMarcStructure IsMarcStructureInternal );
24
use C4::Biblio qw( GetFrameworkCode GetMarcStructure IsMarcStructureInternal );
23
use C4::Koha qw( GetAuthorisedValues );
25
use C4::Koha qw( GetAuthorisedValues );
Lines 242-248 sub generate_subfield_form { Link Here
242
            my $default_source =
244
            my $default_source =
243
              C4::Context->preference("DefaultClassificationSource");
245
              C4::Context->preference("DefaultClassificationSource");
244
246
245
            foreach my $class_source ( sort keys %$class_sources ) {
247
            foreach my $class_source (sort {fc($a) cmp fc($b)} keys %$class_sources) {
246
                next
248
                next
247
                  unless $class_sources->{$class_source}->{'used'}
249
                  unless $class_sources->{$class_source}->{'used'}
248
                  or ( $value and $class_source eq $value )
250
                  or ( $value and $class_source eq $value )
(-)a/t/db_dependent/Koha/UI/Form/Builder/Biblio.t (-6 / +6 lines)
Lines 138-150 subtest 'generate_subfield_form class sources' => sub { Link Here
138
        },
138
        },
139
    );
139
    );
140
140
141
    my @class_sources = Koha::ClassSources->search({used => 1}, {order_by => 'cn_source'})->as_list;
141
    my @class_sources = Koha::ClassSources->search( { used => 1 }, { order_by => 'cn_source' } )->as_list;
142
    my %labels = map { $_->cn_source => $_->description } @class_sources;
142
    my %labels        = map { $_->cn_source => $_->description } @class_sources;
143
    my @values = ('', map { $_->cn_source } @class_sources);
143
    my @values        = ( '', map { $_->cn_source } @class_sources );
144
144
145
    is($subfield->{marc_value}->{type}, 'select');
145
    is( $subfield->{marc_value}->{type}, 'select' );
146
    is_deeply($subfield->{marc_value}->{labels}, \%labels);
146
    is_deeply( $subfield->{marc_value}->{labels}, \%labels );
147
    is_deeply($subfield->{marc_value}->{values}, \@values);
147
    is_deeply( $subfield->{marc_value}->{values}, \@values );
148
};
148
};
149
149
150
subtest 'generate_subfield_form authorised value' => sub {
150
subtest 'generate_subfield_form authorised value' => sub {
(-)a/t/db_dependent/Koha/UI/Form/Builder/Item.t (-11 / +11 lines)
Lines 23-28 use utf8; Link Here
23
23
24
use List::MoreUtils qw( uniq );
24
use List::MoreUtils qw( uniq );
25
25
26
use Koha::ClassSources;
26
use Koha::Libraries;
27
use Koha::Libraries;
27
use Koha::MarcSubfieldStructures;
28
use Koha::MarcSubfieldStructures;
28
use Koha::UI::Form::Builder::Item;
29
use Koha::UI::Form::Builder::Item;
Lines 99-114 subtest 'authorised values' => sub { Link Here
99
    };
100
    };
100
101
101
    subtest 'cn_source' => sub {
102
    subtest 'cn_source' => sub {
102
        plan tests => 2;
103
        plan tests => 3;
103
        my ( $subfield ) = grep { $_->{kohafield} eq 'items.cn_source' } @$subfields;
104
        my ($subfield) = grep { $_->{kohafield} eq 'items.cn_source' } @$subfields;
104
        is_deeply( $subfield->{marc_value}->{values}, [ '', 'ddc', 'lcc' ] );
105
105
        is_deeply(
106
        my @class_sources = Koha::ClassSources->search( { used => 1 }, { order_by => 'cn_source' } )->as_list;
106
            $subfield->{marc_value}->{labels},
107
        my %labels        = map { $_->cn_source => $_->description } @class_sources;
107
            {
108
        my @values        = ( '', map { $_->cn_source } @class_sources );
108
                ddc => "Dewey Decimal Classification",
109
109
                lcc => "Library of Congress Classification",
110
        is( $subfield->{marc_value}->{type}, 'select' );
110
            }
111
        is_deeply( $subfield->{marc_value}->{labels}, \%labels );
111
        );
112
        is_deeply( $subfield->{marc_value}->{values}, \@values );
112
    };
113
    };
113
    subtest 'branches' => sub {
114
    subtest 'branches' => sub {
114
        plan tests => 2;
115
        plan tests => 2;
115
- 

Return to bug 37870