Skip to content

Commit 57cecbc

Browse files
author
Volodymyr Zaets
committed
Merge remote-tracking branch 'origin/MAGETWO-51048' into PR
2 parents a828b2e + 8d87463 commit 57cecbc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ protected function getIsDeleteFieldConfig($sortOrder)
812812
'config' => [
813813
'componentType' => ActionDelete::NAME,
814814
'fit' => true,
815-
'sortOrder' => $sortOrder,
815+
'sortOrder' => $sortOrder
816816
],
817817
],
818818
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ define([
170170
* @returns {Object} Chainable.
171171
*/
172172
createHeaderTemplate: function (prop) {
173-
var visible = _.isUndefined(prop.visible) ? this.visible() : prop.visible,
173+
var visible = prop.visible !== false,
174174
disabled = _.isUndefined(prop.disabled) ? this.disabled() : prop.disabled;
175175

176176
return {

0 commit comments

Comments
 (0)