MAGETWO-85206: SKUs are unassigned from Catalog Price Rule conditions

Author: Oleksandr Gorkun

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

@@ -175,7 +175,7 @@ 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;
     }
 
@@ -184,13 +184,15 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
      * @param string $formName
      * @return void
      */
-    private function setConditionFormName(\Magento\Rule\Model\Condition\AbstractCondition $conditions, $formName)
+    private function setConditionFormName(\Magento\CatalogRule\Api\Data\RuleInterface $rule, \Magento\Rule\Model\Condition\AbstractCondition $conditions, $formName)
     {
         $conditions->setFormName($formName);
-        $conditions->setJsFormObject($formName);
+        $conditions->setJsFormObject(
+            $rule->getConditionsFieldSetId($formName)
+        );
         if ($conditions->getConditions() && is_array($conditions->getConditions())) {
             foreach ($conditions->getConditions() as $condition) {
-                $this->setConditionFormName($condition, $formName);
+                $this->setConditionFormName($rule, $condition, $formName);
             }
         }
     }