From a469c65631b66c12f0aed4f4405c02383c9895a5 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 23 Jan 2018 16:20:53 -0500 Subject: [PATCH] FIX: Missing footer on groups pages --- .../discourse/controllers/group-activity-posts.js.es6 | 2 +- .../discourse/routes/group-activity-posts.js.es6 | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 index 4047450a1cc..f0b6b757f74 100644 --- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 @@ -24,7 +24,7 @@ export default Ember.Controller.extend({ group.findPosts(opts).then(newPosts => { posts.addObjects(newPosts); - if(newPosts.length === 0) { + if (newPosts.length === 0) { this.set('canLoadMore', false); } }).finally(() => { diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 index 827c8c468b6..bc0e3d2ccf7 100644 --- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 @@ -12,8 +12,13 @@ export function buildGroupPage(type) { }, setupController(controller, model) { - this.controllerFor('group-activity-posts').setProperties({ model, type, canLoadMore: true }); - this.controllerFor("group").set("showing", type); + let loadedAll = model.length < 20; + this.controllerFor('group-activity-posts').setProperties({ + model, + type, + canLoadMore: !loadedAll, + }); + this.controllerFor('application').set('showFooter', loadedAll); }, renderTemplate() {