Skip to content

Commit c6e638f

Browse files
committed
Merge branch 'MAGETWO-35185' into PR
2 parents 8d77ae2 + fd90ccc commit c6e638f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ protected function _getCellInputElementId($rowId, $columnName)
181181
*/
182182
protected function _getCellInputElementName($columnName)
183183
{
184-
return $this->getElement()->getName() . '[#{_id}][' . $columnName . ']';
184+
return $this->getElement()->getName() . '[<%- _id %>][' . $columnName . ']';
185185
}
186186

187187
/**
@@ -203,7 +203,7 @@ public function renderCellTemplate($columnName)
203203
return $column['renderer']->setInputName(
204204
$inputName
205205
)->setInputId(
206-
$this->_getCellInputElementId('#{_id}', $columnName)
206+
$this->_getCellInputElementId('<%- _id %>', $columnName)
207207
)->setColumnName(
208208
$columnName
209209
)->setColumn(
@@ -212,15 +212,15 @@ public function renderCellTemplate($columnName)
212212
}
213213

214214
return '<input type="text" id="' . $this->_getCellInputElementId(
215-
'#{_id}',
215+
'<%- _id %>',
216216
$columnName
217217
) .
218218
'"' .
219219
' name="' .
220220
$inputName .
221-
'" value="#{' .
221+
'" value="<%- ' .
222222
$columnName .
223-
'}" ' .
223+
' %>" ' .
224224
($column['size'] ? 'size="' .
225225
$column['size'] .
226226
'"' : '') .

app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function renderCellTemplate($columnName)
6969
)->setName(
7070
$this->_getCellInputElementName($columnName)
7171
)->setHtmlId(
72-
$this->_getCellInputElementId('#{_id}', $columnName)
72+
$this->_getCellInputElementId('<%- _id %>', $columnName)
7373
)->setValues(
7474
$options
7575
);

app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
4242
'prototype'
4343
], function (mageTemplate) {
4444
// create row creator
45-
var arrayRow<?php echo $_htmlId ?> = {
45+
window.arrayRow<?php echo $_htmlId ?> = {
4646

4747
// define row prototypeJS template
4848
template: mageTemplate(

0 commit comments

Comments
 (0)