Skip to content

Commit fb92dc2

Browse files
committed
ACP2E-3149: Double slashes in customer segment URL
1 parent 6ac4086 commit fb92dc2

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

lib/web/mage/adminhtml/grid.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ define([
366366
* @private
367367
*/
368368
_addVarToUrl: function (url, varName, varValue) {
369+
/* eslint-disable-next-line */
369370
var re = new RegExp('\/(' + varName + '\/.*?\/)'),
370371
parts = url.split(new RegExp('\\?'));
371372

@@ -392,6 +393,7 @@ define([
392393
* @private
393394
*/
394395
_buildFormAndSubmit: function (url, varName, varValue) {
396+
/* eslint-disable-next-line*/
395397
var re = new RegExp('\/(' + varName + '\/.*?\/)'),
396398
parts = url.split(new RegExp('\\?')),
397399
form = jQuery('<form></form>'),
@@ -465,8 +467,8 @@ define([
465467
*/
466468
bindFilterFields: function () {
467469
var filters = $$(
468-
'#' + this.containerId + ' [data-role="filter-form"] input',
469-
'#' + this.containerId + ' [data-role="filter-form"] select'
470+
'#' + this.containerId + ' [data-role="filter-form"] input',
471+
'#' + this.containerId + ' [data-role="filter-form"] select'
470472
),
471473
i;
472474

@@ -539,8 +541,8 @@ define([
539541
*/
540542
doFilter: function (callback) {
541543
var filters = $$(
542-
'#' + this.containerId + ' [data-role="filter-form"] input',
543-
'#' + this.containerId + ' [data-role="filter-form"] select'
544+
'#' + this.containerId + ' [data-role="filter-form"] input',
545+
'#' + this.containerId + ' [data-role="filter-form"] select'
544546
),
545547
elements = [],
546548
i;
@@ -1057,7 +1059,7 @@ define([
10571059
*/
10581060
updateCount: function () {
10591061
var checkboxesTotal = varienStringArray.count(
1060-
this.useSelectAll ? this.getGridIds() : this.getCheckboxesValuesAsString()
1062+
this.useSelectAll ? this.getGridIds() : this.getCheckboxesValuesAsString()
10611063
),
10621064
checkboxesChecked = varienStringArray.count(this.checkedString);
10631065

0 commit comments

Comments
 (0)