Merge branch 'MAGETWO-85206' into 2.1-bugfixes

Author: Dmytro Voskoboinikov

app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php

@@ -8,6 +8,8 @@
 use Magento\Backend\Block\Widget\Form;
 use Magento\Backend\Block\Widget\Form\Generic;
 use Magento\Ui\Component\Layout\Tabs\TabInterface;
+use Magento\CatalogRule\Api\Data\RuleInterface;
+use Magento\Rule\Model\Condition\AbstractCondition;
 
 class Conditions extends Generic implements TabInterface
 {
@@ -134,7 +136,7 @@ protected function _prepareForm()
     }
 
     /**
-     * @param \Magento\CatalogRule\Api\Data\RuleInterface $model
+     * @param RuleInterface $model
      * @param string $fieldsetId
      * @param string $formName
      * @return \Magento\Framework\Data\Form
@@ -175,22 +177,30 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
             ->setRenderer($this->_conditions);
 
         $form->setValues($model->getData());
-        $this->setConditionFormName($model->getConditions(), $formName);
+        $this->setConditionFormName($model, $model->getConditions(), $formName);
         return $form;
     }
 
     /**
-     * @param \Magento\Rule\Model\Condition\AbstractCondition $conditions
+     * @param RuleInterface $rule
+     * @param AbstractCondition $conditions
      * @param string $formName
      * @return void
      */
-    private function setConditionFormName(\Magento\Rule\Model\Condition\AbstractCondition $conditions, $formName)
-    {
+    private function setConditionFormName(
+        RuleInterface $rule,
+        AbstractCondition $conditions,
+        $formName
+    ) {
         $conditions->setFormName($formName);
-        $conditions->setJsFormObject($formName);
-        if ($conditions->getConditions() && is_array($conditions->getConditions())) {
+        //For every fieldset there's a different form object.
+        $conditions->setJsFormObject(
+            $rule->getConditionsFieldSetId($formName)
+        );
+        $childConditions = $conditions->getCondition();
+        if ($childConditions && is_array($childConditions)) {
             foreach ($conditions->getConditions() as $condition) {
-                $this->setConditionFormName($condition, $formName);
+                $this->setConditionFormName($rule, $condition, $formName);
             }
         }
     }