Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Kernel/System/DynamicField/Driver/BaseSelect.pm
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ sub EditFieldValueValidate {
my $ErrorMessage;

# perform necessary validations
if ( $Param{Mandatory} && !$Value ) {
if ( $Param{Mandatory} && !( defined $Value && length $Value ) ) {
return {
ServerError => 1,
};
Expand Down
8 changes: 4 additions & 4 deletions Kernel/System/DynamicField/Driver/Multiselect.pm
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ sub EditFieldValueGet {
ITEM:
for my $Item ( sort @Data ) {

if ( !$Item ) {
if ( !defined $Item || !length $Item ) {
splice( @Data, $Index, 1 );
next ITEM;
}
Expand Down Expand Up @@ -524,7 +524,7 @@ sub EditFieldValueValidate {

# validate if value is in possible values list (but let pass empty values)
for my $Item ( @{$Values} ) {
if ( !$PossibleValues->{$Item} ) {
if ( !exists $PossibleValues->{$Item} ) {
$ServerError = 1;
$ErrorMessage = 'The field content is invalid';
}
Expand Down Expand Up @@ -575,11 +575,11 @@ sub DisplayValueRender {

VALUEITEM:
for my $Item (@Values) {
next VALUEITEM if !$Item;
next VALUEITEM if !defined $Item;

my $ReadableValue = $Item;

if ( $PossibleValues->{$Item} ) {
if ( defined $PossibleValues->{$Item} ) {
$ReadableValue = $PossibleValues->{$Item};
if ($TranslatableValues) {
$ReadableValue = $Param{LayoutObject}->{LanguageObject}->Translate($ReadableValue);
Expand Down