Hello Sbisson, jenkins-bot, Mooeypoo,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/391613
to review the following change.
Change subject: Revert "RCFilters: Remove excluded params from URL"
......................................................................
Revert "RCFilters: Remove excluded params from URL"
Breaks limit and days selection by also removing these
params from the AJAX request URL
This reverts commit b8a10e6dcf00da3519ccb9e43d1c2ce0db422557.
Bug: T180577
Change-Id: Ifc6fa8cde8ffce0ac79fc3a2db55291bc2a84e20
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
M tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
2 files changed, 0 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/13/391613/1
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
index 0e20e3f..53557f6 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
@@ -92,9 +92,6 @@
)
);
- // Remove excluded params from the url
- uri.query = this.filtersModel.removeExcludedParams( uri.query );
-
// Reapply unrecognized params and url version
uri.query = $.extend( true, {}, uri.query, unrecognizedParams,
{ urlversion: '2' } );
diff --git
a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
index 2bc9c21..534af86 100644
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
@@ -25,15 +25,6 @@
{ name: 'filter5', cssClass: 'filter5class' },
{ name: 'filter6' } // Not supporting highlights
]
- }, {
- name: 'group4',
- title: 'Group 4',
- type: 'boolean',
- isSticky: true,
- filters: [
- { name: 'stickyFilter7', cssClass:
'filter7class' },
- { name: 'stickyFilter8', cssClass:
'filter8class' }
- ]
} ],
minimalDefaultParams = {
filter1: '1',
@@ -93,17 +84,6 @@
( uriProcessor.getUpdatedUri( { foo: 'bar' } ) ).query,
{ urlversion: '2', filter2: '1', group3: 'filter5',
foo: 'bar' },
'Model state is reflected in the updated URI with
existing uri params'
- );
-
- // Update the model with sticky filter
- filtersModel.toggleFiltersSelected( {
- group4__stickyFilter7: true
- } );
-
- assert.deepEqual(
- ( uriProcessor.getUpdatedUri( {} ) ).query,
- { urlversion: '2', filter2: '1', group3: 'filter5' },
- 'Sticky parameters are not reflected in the URI query'
);
} );
--
To view, visit https://gerrit.wikimedia.org/r/391613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc6fa8cde8ffce0ac79fc3a2db55291bc2a84e20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
