diff --git a/app/assets/javascripts/discourse/controllers/group_controller.js b/app/assets/javascripts/discourse/controllers/group_controller.js index ca2af991e9c..8d7d193ec04 100644 --- a/app/assets/javascripts/discourse/controllers/group_controller.js +++ b/app/assets/javascripts/discourse/controllers/group_controller.js @@ -7,7 +7,7 @@ @module Discourse **/ Discourse.GroupController = Discourse.ObjectController.extend({ - postsCount: null, + counts: null, // It would be nice if bootstrap marked action lists as selected when their links // were 'active' not the `li` tags. diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/models/group.js index 7448fecd089..e9a94188f33 100644 --- a/app/assets/javascripts/discourse/models/group.js +++ b/app/assets/javascripts/discourse/models/group.js @@ -154,9 +154,9 @@ Discourse.Group.reopenClass({ }); }, - findPostsCount: function(name) { - return Discourse.ajax("/groups/" + name + "/posts_count.json").then(function(g) { - return g.posts_count; + findGroupCounts: function(name) { + return Discourse.ajax("/groups/" + name + "/counts.json").then(function (result) { + return Em.Object.create(result.counts); }); }, diff --git a/app/assets/javascripts/discourse/routes/group_route.js b/app/assets/javascripts/discourse/routes/group_route.js index 28613085894..e3dce176088 100644 --- a/app/assets/javascripts/discourse/routes/group_route.js +++ b/app/assets/javascripts/discourse/routes/group_route.js @@ -14,15 +14,15 @@ Discourse.GroupRoute = Discourse.Route.extend({ afterModel: function(model) { var self = this; - return Discourse.Group.findPostsCount(model.get('name')).then(function (c) { - self.set('postsCount', c); + return Discourse.Group.findGroupCounts(model.get('name')).then(function (counts) { + self.set('counts', counts); }); }, setupController: function(controller, model) { controller.setProperties({ model: model, - postsCount: this.get('postsCount') + counts: this.get('counts') }); } }); diff --git a/app/assets/javascripts/discourse/templates/group.js.handlebars b/app/assets/javascripts/discourse/templates/group.js.handlebars index c4cff14ccca..623795844c4 100644 --- a/app/assets/javascripts/discourse/templates/group.js.handlebars +++ b/app/assets/javascripts/discourse/templates/group.js.handlebars @@ -3,11 +3,12 @@