Skip to content

Commit 69402fd

Browse files
author
Ihor Melnychenko
committed
MAGETWO-45294: JS error on creditmemo view grid during export to CSV
-fixed order invoices export -fixed order shipment export
1 parent 20932a9 commit 69402fd

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

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: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
define([
66
'jquery',
77
'underscore',
8-
'uiElement',
9-
'mage/translate'
8+
'uiElement'
109
], function ($, _, Element) {
1110
'use strict';
1211

1312
return Element.extend({
1413
defaults: {
1514
template: 'ui/grid/exportButton',
1615
checked: '',
17-
title: $.mage.__('Attention'),
18-
message: $.mage.__('You haven\'t selected any items!'),
19-
2016
modules: {
2117
selections: '${ $.selectProvider }'
2218
}
@@ -72,7 +68,14 @@ define([
7268
},
7369

7470
buildOptionUrl: function (option) {
75-
return option.url + '?' + $.param(this.getParams());
71+
var params = this.getParams();
72+
73+
if (!params) {
74+
return 'javascript:void(0);';
75+
}
76+
77+
return option.url + '?' + $.param(params);
78+
//TODO: MAGETWO-40250
7679
},
7780

7881
applyOption: function () {

0 commit comments

Comments
 (0)