MAGETWO-55184: [GitHub #5526]Selected category is not added to Cart Price Rule condition due to JS error

Author: omiroshnichenko

app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php

@@ -176,7 +176,7 @@ protected function addTabToForm($model, $fieldsetId = 'actions_fieldset', $formN
         $actionsFieldSetId = $model->getActionsFieldSetId($formName);
 
         $newChildUrl = $this->getUrl(
-            'sales_rule/promo_quote/newActionHtml/form/rule_actions_fieldset_' . $actionsFieldSetId,
+            'sales_rule/promo_quote/newActionHtml/form/' . $actionsFieldSetId,
             ['form_namespace' => $formName]
         );
 

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php

@@ -55,6 +55,15 @@ public function execute()
                 $this->_redirect('sales_rule/*');
                 return;
             }
+            $model->getConditions()->setFormName('sales_rule_form');
+            $model->getConditions()->setJsFormObject(
+                $model->getConditionsFieldSetId($model->getConditions()->getFormName())
+            );
+            $model->getActions()->setFormName('sales_rule_form');
+            $model->getActions()->setJsFormObject(
+                $model->getActionsFieldSetId($model->getActions()->getFormName())
+            );
+
 
             $resultPage->getLayout()->getBlock('promo_sales_rule_edit_tab_coupons')->setCanShow(true);
         }
@@ -65,15 +74,6 @@ public function execute()
             $model->addData($data);
         }
 
-        $model->getConditions()->setFormName('sales_rule_form');
-        $model->getConditions()->setJsFormObject(
-            $model->getConditionsFieldSetId($model->getConditions()->getFormName())
-        );
-        $model->getActions()->setFormName('sales_rule_form');
-        $model->getActions()->setJsFormObject(
-            $model->getActionsFieldSetId($model->getActions()->getFormName())
-        );
-
         $this->_initAction();
 
         $this->_addBreadcrumb($id ? __('Edit Rule') : __('New Rule'), $id ? __('Edit Rule') : __('New Rule'));

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php

@@ -16,7 +16,7 @@ class NewActionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
     public function execute()
     {
         $id = $this->getRequest()->getParam('id');
-        $formName = $this->getRequest()->getParam('form_namespace');
+        $formName = $this->getRequest()->getParam('form');
         $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
         $type = $typeArr[0];
 

app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php

@@ -42,12 +42,12 @@ public function getNewChildSelectOptions()
         foreach ($productAttributes as $code => $label) {
             if (strpos($code, 'quote_item_') === 0) {
                 $iAttributes[] = [
-                    'value' => \Magento\SalesRule\Model\Rule\Condition\Product::class . $code,
+                    'value' => \Magento\SalesRule\Model\Rule\Condition\Product::class . '|' . $code,
                     'label' => $label,
                 ];
             } else {
                 $pAttributes[] = [
-                    'value' => \Magento\SalesRule\Model\Rule\Condition\Product::class . $code,
+                    'value' => \Magento\SalesRule\Model\Rule\Condition\Product::class . '|' . $code,
                     'label' => $label,
                 ];
             }