Skip to content

Commit 77d76c2

Browse files
author
Oleksandr Dubovyk
committed
MAGETWO-66510: Javascript error prevents adding/removing categories from existing catalog price rule condition
1 parent 75d1e40 commit 77d76c2

File tree

1 file changed

+8
-5
lines changed
  • app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab

1 file changed

+8
-5
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\Backend\Block\Widget\Form;
99
use Magento\Backend\Block\Widget\Form\Generic;
1010
use Magento\Ui\Component\Layout\Tabs\TabInterface;
11+
use Magento\Rule\Model\Condition\AbstractCondition;
1112

1213
class Conditions extends Generic implements TabInterface
1314
{
@@ -175,22 +176,24 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
175176
->setRenderer($this->_conditions);
176177

177178
$form->setValues($model->getData());
178-
$this->setConditionFormName($model->getConditions(), $formName);
179+
$this->setConditionFormName($model->getConditions(), $formName, $model->getConditionsFieldSetId($formName));
179180
return $form;
180181
}
181182

182183
/**
183-
* @param \Magento\Rule\Model\Condition\AbstractCondition $conditions
184+
* @param AbstractCondition $conditions
184185
* @param string $formName
186+
* @param string $jsFormName
185187
* @return void
186188
*/
187-
private function setConditionFormName(\Magento\Rule\Model\Condition\AbstractCondition $conditions, $formName)
189+
private function setConditionFormName(AbstractCondition $conditions, $formName, $jsFormName)
188190
{
189191
$conditions->setFormName($formName);
190-
$conditions->setJsFormObject($formName);
192+
$conditions->setJsFormObject($jsFormName);
193+
191194
if ($conditions->getConditions() && is_array($conditions->getConditions())) {
192195
foreach ($conditions->getConditions() as $condition) {
193-
$this->setConditionFormName($condition, $formName);
196+
$this->setConditionFormName($condition, $formName, $jsFormName);
194197
}
195198
}
196199
}

0 commit comments

Comments
 (0)