Skip to content

Commit 7ade44e

Browse files
author
Hwashiang Yu
committed
MC-18721: Customer Inline editor option error
- Resolved incorrect template disabling - Updated template render logic during recursive render
1 parent aab079d commit 7ade44e

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

app/code/Magento/Ui/view/base/web/js/grid/editing/record.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,6 @@ define([
134134

135135
field = utils.extend({}, fields.base, field);
136136

137-
field.__disableTmpl = {
138-
label: true,
139-
options: true
140-
};
141-
142137
return utils.template(field, {
143138
record: this,
144139
column: column

lib/web/mage/utils/template.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ define([
136136
cycles = 0;
137137

138138
while (~tmpl.indexOf(opener) && (typeof maxCycles === 'undefined' || cycles < maxCycles)) {
139-
tmpl = template(tmpl, data);
139+
if (!isTmplIgnored(tmpl, data)) {
140+
tmpl = template(tmpl, data);
141+
}
140142

141143
if (tmpl === last) {
142144
break;

0 commit comments

Comments
 (0)