Skip to content

Commit 71f1e99

Browse files
author
OlgaVasyltsun
committed
MC-35458: Config fields changes
1 parent 2dc8c02 commit 71f1e99

File tree

1 file changed

+12
-3
lines changed
  • app/code/Magento/Config/Block/System/Config/Form

1 file changed

+12
-3
lines changed

app/code/Magento/Config/Block/System/Config/Form/Fieldset.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,18 @@ protected function _isCollapseState($element)
274274
return true;
275275
}
276276

277+
if (!empty($element->getGroup()['depends']['fields'])) {
278+
foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
279+
if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
280+
if ($dependFieldData['value'] !== $this->getConfigData($dependFieldData['id'])) {
281+
return false;
282+
}
283+
}
284+
}
285+
}
286+
277287
$extra = $this->_authSession->getUser()->getExtra();
288+
278289
if (isset($extra['configState'][$element->getId()])) {
279290
return $extra['configState'][$element->getId()];
280291
}
@@ -292,9 +303,7 @@ private function addVisibilityTag(AbstractElement $field): string
292303
$elementId = '';
293304
$styleTag = '';
294305

295-
if (!empty($field->getFieldConfig()['depends']['fields'])
296-
|| !empty($field->getContainer()->getGroup()['depends']['fields'])
297-
) {
306+
if (!empty($field->getFieldConfig()['depends']['fields'])) {
298307
$elementId = '#row_' . $field->getHtmlId();
299308
} elseif (!empty($field->getGroup()['depends']['fields'])) {
300309
$elementId = '#' . $field->getHtmlId() . '-head';

0 commit comments

Comments
 (0)