Fix depends field not working for radio elements #11539: case when de…

…pends field is not exist
magento · Feb 16, 2018 · da5692c · da5692c
1 parent 3d5cc51
commit da5692c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -184,33 +184,19 @@ protected function _prepareForm()
             'form_after',
             $this->getLayout()->createBlock(
                 \Magento\Backend\Block\Widget\Form\Element\Dependence::class
-            )->addFieldMap(
-                "is_wysiwyg_enabled",
-                'wysiwyg_enabled'
             )->addFieldMap(
                 "is_html_allowed_on_front",
                 'html_allowed_on_front'
             )->addFieldMap(
                 "frontend_input",
                 'frontend_input_type'
-            )->addFieldDependence(
-                'wysiwyg_enabled',
-                'frontend_input_type',
-                'textarea'
-            )->addFieldDependence(
-                'html_allowed_on_front',
-                'wysiwyg_enabled',
-                '0'
-            )
-            ->addFieldMap(
+            )->addFieldMap(
                 "is_searchable",
                 'searchable'
-            )
-            ->addFieldMap(
+            )->addFieldMap(
                 "is_visible_in_advanced_search",
                 'advanced_search'
-            )
-            ->addFieldDependence(
+            )->addFieldDependence(
                 'advanced_search',
                 'searchable',
                 '1'

diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
@@ -456,12 +456,14 @@ define([
                 } else {
                     values = valuesFrom[idFrom].values;
                     fromId = $(idFrom + values[0]);
-                    radioFrom = fromId ? $$('[name="' + fromId.name + '"]:checked') : [];
-                    isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1;
-                    isNegative = valuesFrom[idFrom].negative;
+                    if (fromId) {
+                        radioFrom = $$('[name="' + fromId.name + '"]:checked');
+                        isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1;
+                        isNegative = valuesFrom[idFrom].negative;
 
-                    if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) {
-                        shouldShowUp = false;
+                        if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) {
+                            shouldShowUp = false;
+                        }
                     }
                 }
             }