wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 07:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use the actual total notification count in the special page sidebar"

Browse source
This commit is contained in:
jenkins-bot 2016-06-23 11:05:14 +00:00 committed by Gerrit Code Review
parent bbf2ba7e7b e4b79c1bc2
commit 190994bab2
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/api/ApiEchoUnreadNotificationPages.php
View file

@ -88,7 +88,10 @@ class ApiEchoUnreadNotificationPages extends ApiCrossWikiBase {
); );
} }
return array( 'pages' => $result ); return array(
'pages' => $result,
'totalCount' => MWEchoNotifUser::newFromUser( $this->getUser() )->getLocalNotificationCount(),
);
} }
/** /**

10
modules/model/mw.echo.dm.SourcePagesModel.js
View file

@ -189,18 +189,17 @@
* @param {Object} details Details object * @param {Object} details Details object
*/ */
mw.echo.dm.SourcePagesModel.prototype.setSourcePagesDetails = function ( source, details ) { mw.echo.dm.SourcePagesModel.prototype.setSourcePagesDetails = function ( source, details ) {
var id, pageDetails, count; var id, pageDetails;
// Source information // Source information
this.sources[ source ] = { this.sources[ source ] = {
title: details.source.title, title: details.source.title,
base: details.source.base, base: details.source.base,
totalCount: 0, totalCount: details.totalCount,
pages: {} pages: {}
}; };
// Fill in pages // Fill in pages
count = 0;
for ( id in details.pages ) { for ( id in details.pages ) {
pageDetails = details.pages[ id ]; pageDetails = details.pages[ id ];
this.sources[ source ].pages[ id ] = { this.sources[ source ].pages[ id ] = {
@ -208,11 +207,6 @@
count: pageDetails.count, count: pageDetails.count,
id: id id: id
}; };
count += parseInt( pageDetails.count );
} }
// Update total count
this.sources[ source ].totalCount = count;
}; };
} )( mediaWiki ); } )( mediaWiki );