Skip to content

Commit 4e348fd

Browse files
Fix Admin Customizable Options Dropdown sort_order issue
1 parent 310648c commit 4e348fd

File tree

6 files changed

+6
-4
lines changed

6 files changed

+6
-4
lines changed

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
<!-- ko foreach: { data: $record().elems(), as: 'elem'} -->
7171
<td if="elem.template"
72-
visible="elem.visible"
72+
visible="elem.visible() && elem.formElement !== 'hidden'"
7373
disable="elem.disabled"
7474
css="$parent.setClasses(elem)"
7575
template="elem.template"

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,7 @@ protected function getPositionFieldConfig($sortOrder)
871871
'formElement' => Hidden::NAME,
872872
'dataScope' => static::FIELD_SORT_ORDER_NAME,
873873
'dataType' => Number::NAME,
874+
'visible' => false,
874875
'sortOrder' => $sortOrder,
875876
],
876877
],

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ define([
543543
data = this.createHeaderTemplate(cell.config);
544544
cell.config.labelVisible = false;
545545
_.extend(data, {
546+
defaultLabelVisible: data.visible(),
546547
label: cell.config.label,
547548
name: cell.name,
548549
required: !!cell.config.validation,

app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ define([
245245
label = _.findWhere(this.parentComponent().labels(), {
246246
name: index
247247
});
248-
label.visible() !== state ? label.visible(state) : false;
248+
label.defaultLabelVisible && label.visible(state);
249249
} else {
250250
elems[curElem].visible(state);
251251
}

app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<!-- ko foreach: { data: $record().elems(), as: 'elem'} -->
4242
<td if="elem.template"
4343
css="$parent.setClasses(elem)"
44-
visible="elem.visible"
44+
visible="elem.visible() && elem.formElement !== 'hidden'"
4545
disable="elem.disabled"
4646
template="elem.template"/>
4747
<!-- /ko -->

app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<!-- ko foreach: { data: $record().elems(), as: 'elem'} -->
6060
<td if="elem.template"
61-
visible="elem.visible"
61+
visible="elem.visible() && elem.formElement !== 'hidden'"
6262
disable="elem.disabled"
6363
css="$parent.setClasses(elem)"
6464
template="elem.template"

0 commit comments

Comments
 (0)