MAGETWO-69229: Fix depends per group in system.xml #9391

- Merge Pull Request #9391 from osrecio/magento2:patch-1
magento · May 16, 2017 · 672fe92 · 672fe92
2 parents 51930d9 + 419d894
commit 672fe92
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
@@ -453,6 +453,9 @@ define([
             if (target) {
                 inputs = target.up(this._config['levels_up']).select('input', 'select', 'td');
                 isAnInputOrSelect = ['input', 'select'].indexOf(target.tagName.toLowerCase()) != -1; //eslint-disable-line
+                if (target.type === 'fieldset') {
+                    var inputs = target.select('input', 'select', 'td');
+                }
             } else {
                 inputs = false;
                 isAnInputOrSelect = false;
@@ -531,6 +534,9 @@ define([
 
             if (rowElement == undefined && target) { //eslint-disable-line eqeqeq
                 rowElement = target.up(this._config['levels_up']);
+                if (target.type === 'fieldset') {
+                    rowElement = target;
+                }
             }
 
             if (rowElement) {