Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372877 )
Change subject: WLFilters: set default values
......................................................................
WLFilters: set default values
* Respect different default values for 'limit' and 'day'
in RC and WL.
* Make 'latestrevision' active by default on WL
Bug: T171134
Change-Id: I3e48a9f2d9b70f0b9f6d7c6329db9c8e8001ee49
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
4 files changed, 28 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/77/372877/1
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index 52db51a..c9f7695 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -598,7 +598,9 @@
[
'maxDays' =>
(int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
'limitArray' =>
$this->getConfig()->get( 'RCLinkLimits' ),
+ 'limitDefault' =>
$this->getDefaultLimit(),
'daysArray' => $this->getConfig()->get(
'RCLinkDays' ),
+ 'daysDefault' =>
$this->getDefaultDays(),
]
);
}
@@ -1535,4 +1537,8 @@
protected function isStructuredFilterUiEnabled() {
return $this->getUser()->getOption( 'rcenhancedfilters' );
}
+
+ abstract function getDefaultLimit();
+
+ abstract function getDefaultDays();
}
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index 4659b9d..d6eac32 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -991,4 +991,12 @@
protected function getCacheTTL() {
return 60 * 5;
}
+
+ function getDefaultLimit() {
+ return $this->getUser()->getIntOption( 'rclimit' );
+ }
+
+ function getDefaultDays() {
+ return $this->getUser()->getIntOption( 'rcdays' );
+ }
}
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index b20b331..224649a 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -142,6 +142,10 @@
protected function registerFilters() {
parent::registerFilters();
+ $this->getFilterGroup( 'lastRevision' )
+ ->getFilter( 'hidepreviousrevisions' )
+ ->setDefault( true );
+
$this->registerFilterGroup( new
ChangesListStringOptionsFilterGroup( [
'name' => 'watchlistactivity',
'title' => 'rcfilters-filtergroup-watchlistactivity',
@@ -858,4 +862,12 @@
$count = $store->countWatchedItems( $this->getUser() );
return floor( $count / 2 );
}
+
+ function getDefaultLimit() {
+ return $this->getUser()->getIntOption( 'wllimit' );
+ }
+
+ function getDefaultDays() {
+ return $this->getUser()->getIntOption( 'watchlistdays' );
+ }
}
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index c24e6c6..7dd1a28 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -97,11 +97,6 @@
};
}
- // Convert the default from the old preference
- // since the limit preference actually affects more
- // than just the RecentChanges page
- limitDefault = Number( mw.user.options.get( 'rclimit', '50' ) );
-
// Add parameter range operations
views.range = {
groups: [
@@ -117,7 +112,7 @@
max: 1000
},
sortFunc: function ( a, b ) { return
Number( a.name ) - Number( b.name ); },
- 'default': String( limitDefault ),
+ 'default': displayConfig.limitDefault,
// Temporarily making this not sticky
until we resolve the problem
// with the misleading preference. Note
that if this is to be permanent
// we should remove all sticky behavior
methods completely
@@ -145,7 +140,7 @@
( Number( i ) * 24
).toFixed( 2 ) :
Number( i );
},
- 'default': mw.user.options.get(
'rcdays', '30' ),
+ 'default': displayConfig.daysDefault,
// Temporarily making this not sticky
while limit is not sticky, see above
// isSticky: true,
excludedFromSavedQueries: true,
--
To view, visit https://gerrit.wikimedia.org/r/372877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e48a9f2d9b70f0b9f6d7c6329db9c8e8001ee49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
