Skip to content

Commit fb67016

Browse files
committed
MAGETWO-44495: Apply fixes from MAGETWO-43922 regarding features that are present in mainline
1 parent 6d75339 commit fb67016

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

app/code/Magento/Ui/view/base/web/js/grid/columns/onoff.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,17 @@ define([
4242
*/
4343
initProperties: function () {
4444
this.actions = [{
45+
value: 'selectAll',
46+
label: $t('Select All')
47+
}, {
48+
value: 'deselectAll',
49+
label: $t('Deselect All')
50+
}, {
4551
value: 'selectPage',
46-
label: $t('Select all on this page')
52+
label: $t('Select All on This Page')
4753
}, {
4854
value: 'deselectPage',
49-
label: $t('Deselect all on this page')
55+
label: $t('Deselect All on This Page')
5056
}];
5157

5258
return this._super();

app/code/Magento/Ui/view/base/web/templates/grid/columns/onoff.html

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,29 @@
88
<th class="data-grid-multicheck-cell">
99
<label data-bind="i18n: 'Assign'"></label>
1010
<div
11-
class="action-multicheck-wrap"
12-
style="width: 3.3rem"
13-
data-bind="css: {'_disabled': !totalRecords()}, collapsible">
11+
class="action-multicheck-wrap"
12+
data-bind="css: {'_disabled': !totalRecords()},
13+
collapsible">
1414
<input
15-
id="mass-select-checkbox"
16-
class="admin__control-checkbox"
17-
type="checkbox"
18-
data-bind="checked: allSelected(),
15+
id="mass-select-checkbox"
16+
class="admin__control-checkbox"
17+
type="checkbox"
18+
data-bind="checked: allSelected(),
1919
event: { change: toggleSelectAll },
2020
css: { '_indeterminate': indetermine },
2121
enable: totalRecords">
22-
<label for="mass-select-checkbox" class="data-grid-onoff-label">
23-
<span data-bind="i18n: 'Select all'"></span>
24-
</label>
22+
<label for="mass-select-checkbox"></label>
2523
<button
26-
class="action-multicheck-toggle"
27-
data-toggle="dropdown"
28-
data-bind="css: { '_active': $collapsible.opened },
29-
enable: totalRecords
24+
class="action-multicheck-toggle"
25+
data-toggle="dropdown"
26+
data-bind="css: { '_active': $collapsible.opened },
27+
enable: totalRecords,
3028
toggleCollapsible">
3129
<span data-bind="i18n: 'Options'"></span>
3230
</button>
3331
<ul
34-
class="action-menu"
35-
data-bind="closeCollapsible, foreach: actions">
32+
class="action-menu"
33+
data-bind="closeCollapsible, foreach: actions">
3634
<li data-bind="click: $parent[value].bind($parent),
3735
visible: $parent.isActionRelevant(value)">
3836
<span class="action-menu-item" data-bind="text: label"></span>

0 commit comments

Comments
 (0)