Merge branch 'cart-price-rules' into FearlessKiwis-MAGETWO-43124-Cart-Price-Rules-staging-dashboard

Mike Weis · Mike Weis · commit 644368885dcf · 2016-02-18T13:10:06.000-06:00
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php
@@ -151,7 +151,7 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
         }
         $conditionsFieldSetId = $model->getConditionsFieldSetId($formName);
         $newChildUrl = $this->getUrl(
-            'sales_rule/promo_quote/newConditionHtml/form/rule_conditions_fieldset_' . $conditionsFieldSetId,
+            'sales_rule/promo_quote/newConditionHtml/form/' . $conditionsFieldSetId,
             ['form_namespace' => $formName]
         );
 

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo`
`151`	`151`	`}`
`152`	`152`	`$conditionsFieldSetId = $model->getConditionsFieldSetId($formName);`
`153`	`153`	`$newChildUrl = $this->getUrl(`
`154`		`- 'sales_rule/promo_quote/newConditionHtml/form/rule_conditions_fieldset_' . $conditionsFieldSetId,`
	`154`	`+ 'sales_rule/promo_quote/newConditionHtml/form/' . $conditionsFieldSetId,`
`155`	`155`	`['form_namespace' => $formName]`
`156`	`156`	`);`
`157`	`157`