diff --git a/app/assets/javascripts/admin/routes/admin_dashboard_route.js b/app/assets/javascripts/admin/routes/admin_dashboard_route.js index 2441eb74e75..fb3562bc5e5 100644 --- a/app/assets/javascripts/admin/routes/admin_dashboard_route.js +++ b/app/assets/javascripts/admin/routes/admin_dashboard_route.js @@ -23,9 +23,19 @@ Discourse.AdminDashboardRoute = Discourse.Route.extend({ _.each(d.reports,function(report){ c.set(report.type, Discourse.Report.create(report)); }); - _.each(['admins', 'moderators', 'blocked', 'banned', 'top_referrers', 'top_traffic_sources', 'top_referred_topics'], function(x) { + + var topReferrers = d.top_referrers; + if (topReferrers && topReferrers.data) { + d.top_referrers.data = topReferrers.data.map(function (user) { + return Discourse.AdminUser.create(user); + }); + c.set('top_referrers', topReferrers); + } + + ['admins', 'moderators', 'blocked', 'banned', 'top_traffic_sources', 'top_referred_topics'].forEach(function(x) { c.set(x, d[x]); }); + c.set('loading', false); }); } diff --git a/app/assets/javascripts/admin/routes/admin_user_route.js b/app/assets/javascripts/admin/routes/admin_user_route.js index dbf5770bdb6..d09b89f25ba 100644 --- a/app/assets/javascripts/admin/routes/admin_user_route.js +++ b/app/assets/javascripts/admin/routes/admin_user_route.js @@ -26,8 +26,8 @@ Discourse.AdminUserRoute = Discourse.Route.extend({ adminUser.loadDetails().then(function () { adminUser.setOriginalTrustLevel(); controller.set('model', adminUser); + window.scrollTo(0, 0); }); - } });