Skip to content

Commit bc92edc

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-89453' into 2.2.4-develop-pr23
2 parents 8118353 + 6767248 commit bc92edc

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

lib/web/mage/adminhtml/form.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,12 +456,15 @@ define([
456456
} else {
457457
values = valuesFrom[idFrom].values;
458458
fromId = $(idFrom + values[0]);
459-
radioFrom = fromId ? $$('[name="' + fromId.name + '"]:checked') : [];
460-
isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1;
461-
isNegative = valuesFrom[idFrom].negative;
462459

463-
if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) {
464-
shouldShowUp = false;
460+
if (fromId) {
461+
radioFrom = $$('[name="' + fromId.name + '"]:checked');
462+
isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1;
463+
isNegative = valuesFrom[idFrom].negative;
464+
465+
if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) {
466+
shouldShowUp = false;
467+
}
465468
}
466469
}
467470
}

0 commit comments

Comments
 (0)