From: Catrope <roan@wikimedia.org>
Date: Wed, 15 Nov 2017 18:34:55 +0000 (+0000)
Subject: Revert "RCFilters: Remove excluded params from URL"
X-Git-Tag: 1.31.0-rc.0~1491^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=e466f376f66516c9a5372111b8c507c267c4c84b;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
index 0e20e3f08b..53557f641f 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 2bc9c211a2..534af86d64 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',
@@ -94,17 +85,6 @@
 			{ 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'
-		);
 	} );
 
 	QUnit.test( 'updateModelBasedOnQuery', function ( assert ) {