|
8 | 8 | use Magento\Backend\Block\Widget\Form;
|
9 | 9 | use Magento\Backend\Block\Widget\Form\Generic;
|
10 | 10 | use Magento\Ui\Component\Layout\Tabs\TabInterface;
|
| 11 | +use Magento\Rule\Model\Condition\AbstractCondition; |
11 | 12 |
|
12 | 13 | class Conditions extends Generic implements TabInterface
|
13 | 14 | {
|
@@ -175,22 +176,24 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
|
175 | 176 | ->setRenderer($this->_conditions);
|
176 | 177 |
|
177 | 178 | $form->setValues($model->getData());
|
178 |
| - $this->setConditionFormName($model->getConditions(), $formName); |
| 179 | + $this->setConditionFormName($model->getConditions(), $formName, $model->getConditionsFieldSetId($formName)); |
179 | 180 | return $form;
|
180 | 181 | }
|
181 | 182 |
|
182 | 183 | /**
|
183 |
| - * @param \Magento\Rule\Model\Condition\AbstractCondition $conditions |
| 184 | + * @param AbstractCondition $conditions |
184 | 185 | * @param string $formName
|
| 186 | + * @param string $jsFormName |
185 | 187 | * @return void
|
186 | 188 | */
|
187 |
| - private function setConditionFormName(\Magento\Rule\Model\Condition\AbstractCondition $conditions, $formName) |
| 189 | + private function setConditionFormName(AbstractCondition $conditions, $formName, $jsFormName) |
188 | 190 | {
|
189 | 191 | $conditions->setFormName($formName);
|
190 |
| - $conditions->setJsFormObject($formName); |
| 192 | + $conditions->setJsFormObject($jsFormName); |
| 193 | + |
191 | 194 | if ($conditions->getConditions() && is_array($conditions->getConditions())) {
|
192 | 195 | foreach ($conditions->getConditions() as $condition) {
|
193 |
| - $this->setConditionFormName($condition, $formName); |
| 196 | + $this->setConditionFormName($condition, $formName, $jsFormName); |
194 | 197 | }
|
195 | 198 | }
|
196 | 199 | }
|
|
0 commit comments