From 370be68026a2c7ee305078fec55848047b9e7203 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 2 Aug 2018 15:56:11 +0200 Subject: [PATCH] Bug 14662: Add empty entries to pull downs in cataloguing form for mandatory subfields First patch deals with the problem on the item form, this patch fixes the same problem on catalouging form for the bibliographic record. To test: - Adapt your frameworks: - Make sure 942$c is mandatory - Link another field to an authorised value, for example: 942$n to YESNO - Add a new record - Verify that the first value of each pull down is preselected, there is no way to trigger the 'required' error - Apply patch - Add a record - Verify that classification source is preselected according to the DefaultClassificationSource system preference - Verify that 942$c now defaults to empty - Verify all your other mandatory subfields can be set to empty - Verify that you can't save before correctly setting them - Chane your frameworks - Add a default value for 942$c, for example: CF - Add another record - Verify the itemtype is now preset to your default itemtype - Edit an existing record, verify all values show correctly Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 038e4011d4e4c1270592d476479062467a7a9be8) Signed-off-by: Martin Renvoize (cherry picked from commit b0d692dcaaa38a5e4842b2c1466560f08fd2b0e5) Signed-off-by: Fridolin Somers --- cataloguing/addbiblio.pl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 3d14f83e66..6606ac2625 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -184,9 +184,7 @@ sub build_authorized_values_list { } } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { - push @authorised_values, "" - unless ( $tagslib->{$tag}->{$subfield}->{mandatory} - && ( $value || $tagslib->{$tag}->{$subfield}->{defaultvalue} ) ); + push @authorised_values, ""; my $itemtype; my $itemtypes = Koha::ItemTypes->search_with_localization; @@ -197,8 +195,7 @@ sub build_authorized_values_list { $value = $itemtype unless ($value); } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "cn_source" ) { - push @authorised_values, "" - unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + push @authorised_values, ""; my $class_sources = GetClassSources(); @@ -220,9 +217,7 @@ sub build_authorized_values_list { $branch_limit ? $branch_limit : (), ); - push @authorised_values, "" - unless ( $tagslib->{$tag}->{$subfield}->{mandatory} - && ( $value || $tagslib->{$tag}->{$subfield}->{defaultvalue} ) ); + push @authorised_values, ""; while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) { push @authorised_values, $value; -- 2.39.5