[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Hide saved queries from anonymous users
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373402 )
Change subject: RCFilters: Hide saved queries from anonymous users
..
RCFilters: Hide saved queries from anonymous users
Bug: T173992
Change-Id: I5acb9ca4dd20de83da5db42c7c9053fccb091da0
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
3 files changed, 55 insertions(+), 43 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 209e7c8..9906119 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -212,21 +212,23 @@
this.filtersModel
);
- try {
- parsedSavedQueries = JSON.parse( mw.user.options.get(
this.savedQueriesPreferenceName ) || '{}' );
- } catch ( err ) {
- parsedSavedQueries = {};
- }
+ if ( !mw.user.isAnon() ) {
+ try {
+ parsedSavedQueries = JSON.parse(
mw.user.options.get( this.savedQueriesPreferenceName ) || '{}' );
+ } catch ( err ) {
+ parsedSavedQueries = {};
+ }
- // The queries are saved in a minimized state, so we need
- // to send over the base state so the saved queries model
- // can normalize them per each query item
- this.savedQueriesModel.initialize(
- parsedSavedQueries,
- this._getBaseFilterState(),
- // This is for backwards compatibility - delete all
excluded filter states
- Object.keys(
this.filtersModel.getExcludedFiltersState() )
- );
+ // The queries are saved in a minimized state, so we
need
+ // to send over the base state so the saved queries
model
+ // can normalize them per each query item
+ this.savedQueriesModel.initialize(
+ parsedSavedQueries,
+ this._getBaseFilterState(),
+ // This is for backwards compatibility - delete
all excluded filter states
+ Object.keys(
this.filtersModel.getExcludedFiltersState() )
+ );
+ }
// Check whether we need to load defaults.
// We do this by checking whether the current URI query
@@ -238,7 +240,7 @@
// or on request
this.initializing = true;
if (
- this.savedQueriesModel.getDefault() &&
+ !mw.user.isAnon() &&
this.savedQueriesModel.getDefault() &&
!this.uriProcessor.doesQueryContainRecognizedParams(
uri.query )
) {
// We have defaults from a saved query.
@@ -1039,7 +1041,7 @@
var data, queryHighlights,
savedParams = {},
savedHighlights = {},
- defaultSavedQueryItem =
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
+ defaultSavedQueryItem = !mw.user.isAnon() &&
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
if ( defaultSavedQueryItem ) {
data = defaultSavedQueryItem.getData();
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 3aa7161..b15b034 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -85,17 +85,20 @@
classes: [
'mw-rcfilters-ui-filterTagMultiselectWidget-resetButton' ]
} );
- this.saveQueryButton = new
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
- this.controller,
- this.queriesModel
- );
+ if ( !mw.user.isAnon() ) {
+ this.saveQueryButton = new
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
+ this.controller,
+ this.queriesModel
+ );
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Hide saved queries from anonymous users
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373402 )
Change subject: RCFilters: Hide saved queries from anonymous users
..
RCFilters: Hide saved queries from anonymous users
Bug: T173992
Change-Id: I5acb9ca4dd20de83da5db42c7c9053fccb091da0
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
3 files changed, 55 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/02/373402/1
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 209e7c8..9906119 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -212,21 +212,23 @@
this.filtersModel
);
- try {
- parsedSavedQueries = JSON.parse( mw.user.options.get(
this.savedQueriesPreferenceName ) || '{}' );
- } catch ( err ) {
- parsedSavedQueries = {};
- }
+ if ( !mw.user.isAnon() ) {
+ try {
+ parsedSavedQueries = JSON.parse(
mw.user.options.get( this.savedQueriesPreferenceName ) || '{}' );
+ } catch ( err ) {
+ parsedSavedQueries = {};
+ }
- // The queries are saved in a minimized state, so we need
- // to send over the base state so the saved queries model
- // can normalize them per each query item
- this.savedQueriesModel.initialize(
- parsedSavedQueries,
- this._getBaseFilterState(),
- // This is for backwards compatibility - delete all
excluded filter states
- Object.keys(
this.filtersModel.getExcludedFiltersState() )
- );
+ // The queries are saved in a minimized state, so we
need
+ // to send over the base state so the saved queries
model
+ // can normalize them per each query item
+ this.savedQueriesModel.initialize(
+ parsedSavedQueries,
+ this._getBaseFilterState(),
+ // This is for backwards compatibility - delete
all excluded filter states
+ Object.keys(
this.filtersModel.getExcludedFiltersState() )
+ );
+ }
// Check whether we need to load defaults.
// We do this by checking whether the current URI query
@@ -238,7 +240,7 @@
// or on request
this.initializing = true;
if (
- this.savedQueriesModel.getDefault() &&
+ !mw.user.isAnon() &&
this.savedQueriesModel.getDefault() &&
!this.uriProcessor.doesQueryContainRecognizedParams(
uri.query )
) {
// We have defaults from a saved query.
@@ -1039,7 +1041,7 @@
var data, queryHighlights,
savedParams = {},
savedHighlights = {},
- defaultSavedQueryItem =
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
+ defaultSavedQueryItem = !mw.user.isAnon() &&
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
if ( defaultSavedQueryItem ) {
data = defaultSavedQueryItem.getData();
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 3aa7161..b15b034 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -85,17 +85,20 @@
classes: [
'mw-rcfilters-ui-filterTagMultiselectWidget-resetButton' ]
} );
- this.saveQueryButton = new
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
- this.controller,
- this.queriesModel
- );
+ if ( !mw.user.isAnon() ) {
+ this.saveQueryButton = new
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
+ this.controller,
+ this.queriesModel
+ );
-
