Use one request to fetch dashboard report data and check version

This commit is contained in:
Neil Lalonde
2013-03-14 18:26:26 -04:00
parent 6690a2ba3e
commit 6c4d9ecfdc
9 changed files with 111 additions and 50 deletions
@@ -8,8 +8,7 @@
**/
Discourse.AdminDashboardRoute = Discourse.Route.extend({
setupController: function(c) {
this.checkVersion(c);
this.fetchReports(c);
this.fetchDashboardData(c);
this.fetchGithubCommits(c);
},
@@ -17,26 +16,21 @@ Discourse.AdminDashboardRoute = Discourse.Route.extend({
this.render({into: 'admin/templates/admin'});
},
checkVersion: function(c) {
if( Discourse.SiteSettings.version_checks && (!c.get('versionCheckedAt') || Date.create('12 hours ago', 'en') > c.get('versionCheckedAt')) ) {
c.set('versionCheckedAt', new Date());
Discourse.VersionCheck.find().then(function(vc) {
c.set('versionCheck', vc);
fetchDashboardData: function(c) {
if( !c.get('dashboardFetchedAt') || Date.create('1 hour ago', 'en') > c.get('dashboardFetchedAt') ) {
c.set('dashboardFetchedAt', new Date());
Discourse.AdminDashboard.find().then(function(d) {
if( Discourse.SiteSettings.version_checks ){
c.set('versionCheck', Discourse.VersionCheck.create(d.version_check));
}
d.reports.each(function(report){
c.set(report.type, Discourse.Report.create(report));
});
c.set('loading', false);
});
}
},
fetchReports: function(c) {
if( !c.get('reportsCheckedAt') || Date.create('1 hour ago', 'en') > c.get('reportsCheckedAt') ) {
// TODO: use one request to get all reports, or maybe one request for all dashboard data including version check.
c.set('reportsCheckedAt', new Date());
['visits', 'signups', 'topics', 'posts', 'total_users', 'flags'].each(function(reportType){
c.set(reportType, Discourse.Report.find(reportType));
});
}
},
fetchGithubCommits: function(c) {
if( !c.get('commitsCheckedAt') || Date.create('1 hour ago', 'en') > c.get('commitsCheckedAt') ) {
c.set('commitsCheckedAt', new Date());