Skip to content

Commit 8640793

Browse files
author
Olga Nakonechna
committed
Merge remote-tracking branch 'remotes/origin/MAGETWO-45294' into PR
2 parents 9b314ba + 98e770a commit 8640793

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<exportButton name="export_button">
6464
<argument name="data" xsi:type="array">
6565
<item name="config" xsi:type="array">
66-
<item name="selectProvider" xsi:type="string">sales_order_view_creditmemo_grid.sales_order_view_creditmemo_grid.sales_order_view_creditmemo_columns.ids</item>
66+
<item name="selectProvider" xsi:type="string">sales_order_view_creditmemo_grid.sales_order_view_creditmemo_grid.sales_order_creditmemo_columns.ids</item>
6767
</item>
6868
</argument>
6969
</exportButton>

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<exportButton name="export_button">
6464
<argument name="data" xsi:type="array">
6565
<item name="config" xsi:type="array">
66-
<item name="selectProvider" xsi:type="string">sales_order_view_invoice_grid.sales_order_view_invoice_grid.sales_order_view_invoice_columns.ids</item>
66+
<item name="selectProvider" xsi:type="string">sales_order_view_invoice_grid.sales_order_view_invoice_grid.sales_order_invoice_columns.ids</item>
6767
</item>
6868
</argument>
6969
</exportButton>

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<exportButton name="export_button">
6464
<argument name="data" xsi:type="array">
6565
<item name="config" xsi:type="array">
66-
<item name="selectProvider" xsi:type="string">sales_order_view_shipment_grid.sales_order_view_shipment_grid.sales_order_view_shipment_columns.ids</item>
66+
<item name="selectProvider" xsi:type="string">sales_order_view_shipment_grid.sales_order_view_shipment_grid.sales_order_shipment_columns.ids</item>
6767
</item>
6868
</argument>
6969
</exportButton>

app/code/Magento/Ui/view/base/web/js/grid/export.js

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,28 @@ define([
3636
this.options[0].value
3737
);
3838
}
39+
3940
return this;
4041
},
4142

4243
getParams: function () {
4344
var selections = this.selections(),
44-
data = selections.getSelections(),
45-
itemsType = data.excludeMode ? 'excluded' : 'selected',
45+
data = selections ? selections.getSelections() : null,
46+
itemsType,
4647
result = {};
4748

48-
result['filters'] = data.params.filters;
49-
result['search'] = data.params.search;
50-
result['namespace'] = data.params.namespace;
51-
result[itemsType] = data[itemsType];
49+
if (data) {
50+
itemsType = data.excludeMode ? 'excluded' : 'selected';
51+
result.filters = data.params.filters;
52+
result.search = data.params.search;
53+
result.namespace = data.params.namespace;
54+
result[itemsType] = data[itemsType];
5255

53-
if (!result[itemsType].length) {
54-
result[itemsType] = false;
56+
if (!result[itemsType].length) {
57+
result[itemsType] = false;
58+
}
5559
}
60+
5661
return result;
5762
},
5863

@@ -63,16 +68,22 @@ define([
6368
},
6469

6570
buildOptionUrl: function (option) {
66-
var url = option.url + '?';
71+
var params = this.getParams();
6772

68-
return url + $.param(this.getParams());
73+
if (!params) {
74+
return 'javascript:void(0);';
75+
}
76+
77+
return option.url + '?' + $.param(params);
78+
//TODO: MAGETWO-40250
6979
},
7080

7181
applyOption: function () {
7282
var option = this.getActiveOption(),
7383
url = this.buildOptionUrl(option);
7484

7585
location.href = url;
86+
7687
}
7788
});
7889
});

0 commit comments

Comments
 (0)