diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6 index fffc78e0ac..c58b0a7184 100644 --- a/app/assets/javascripts/discourse/controllers/group-index.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6 @@ -14,6 +14,7 @@ export default Ember.Controller.extend({ showActions: false, filter: null, filterInput: null, + application: Ember.inject.controller(), @observes("filterInput") _setFilter: debounce(function() { @@ -27,7 +28,10 @@ export default Ember.Controller.extend({ if (model) { model.findMembers(this.get('memberParams')) - .finally(() => this.set('loading', false)); + .finally(() => { + this.set('application.showFooter', model.members.length >= model.user_count); + this.set('loading', false); + }); } }, @@ -81,7 +85,10 @@ export default Ember.Controller.extend({ loadMore() { if (this.get("loading")) { return; } - if (this.get("model.members.length") >= this.get("model.user_count")) { return; } + if (this.get("model.members.length") >= this.get("model.user_count")) { + this.set("application.showFooter", true); + return; + } this.set("loading", true); diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 index 0019127c3a..bd6bb30472 100644 --- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 @@ -4,6 +4,7 @@ export default Ember.Controller.extend({ group: Ember.inject.controller(), loading: false, offset: 0, + application: Ember.inject.controller(), init() { this._super(); @@ -27,6 +28,11 @@ export default Ember.Controller.extend({ }); }, + @observes("model.all_loaded") + _showFooter() { + this.set("application.showFooter", this.get("model.all_loaded")); + }, + reset() { this.setProperties({ offset: 0, diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 index f5b26ccd0c..590722bb0f 100644 --- a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + beforeModel() { this.transitionTo("group.manage.profile"); } diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 index 7d0d44b6b8..313fcda642 100644 --- a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + titleToken() { return I18n.t('groups.manage.interaction.title'); }, diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 index eb47fec87d..7689197d96 100644 --- a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + titleToken() { return I18n.t('groups.manage.membership.title'); }, diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 index 7886d867be..e0c37246e1 100644 --- a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + titleToken() { return I18n.t('groups.manage.profile.title'); }, diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js.es6 index e80cab1089..e7af6740ed 100644 --- a/app/assets/javascripts/discourse/routes/group-manage.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-manage.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + titleToken() { return I18n.t('groups.manage.title'); }, diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js.es6 index 24d0e96858..e5a6fdd03c 100644 --- a/app/assets/javascripts/discourse/routes/groups-new.js.es6 +++ b/app/assets/javascripts/discourse/routes/groups-new.js.es6 @@ -1,6 +1,8 @@ import Group from 'discourse/models/group'; export default Discourse.Route.extend({ + showFooter: true, + titleToken() { return I18n.t('admin.groups.new.title'); }, diff --git a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 index 0d67542b2f..b91bbf9aa0 100644 --- a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 +++ b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + model(params) { return this.store.find('tagGroup', params.id); } diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js.es6 index 6d6476964a..fb983936cf 100644 --- a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 +++ b/app/assets/javascripts/discourse/routes/tag-groups.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + model() { return this.store.findAll('tagGroup'); },