IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinate loading of group posts (#5296)

Browse Source
This commit is contained in:
ckeboss
2017-11-07 17:04:21 -08:00
committed by Robin Ward
parent fc7dca58fe
commit 8a8c14c6f7
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
View File

@@ -1,13 +1,17 @@
import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
import { fmt } from 'discourse/lib/computed'; import { fmt } from 'discourse/lib/computed';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
group: Ember.inject.controller(), group: Ember.inject.controller(),
groupActivity: Ember.inject.controller(), groupActivity: Ember.inject.controller(),
application: Ember.inject.controller(),
canLoadMore: true,
loading: false, loading: false,
emptyText: fmt('type', 'groups.empty.%@'), emptyText: fmt('type', 'groups.empty.%@'),
actions: { actions: {
loadMore() { loadMore() {
if (!this.get('canLoadMore')) { return; }
if (this.get('loading')) { return; } if (this.get('loading')) { return; }
this.set('loading', true); this.set('loading', true);
const posts = this.get('model'); const posts = this.get('model');
@@ -20,9 +24,18 @@ export default Ember.Controller.extend({
group.findPosts(opts).then(newPosts => { group.findPosts(opts).then(newPosts => {
posts.addObjects(newPosts); posts.addObjects(newPosts);
if(newPosts.length === 0) {
this.set('canLoadMore', false);
}
}).finally(() => {
this.set('loading', false); this.set('loading', false);
}); });
} }
} }
},
@observes('canLoadMore')
_showFooter() {
this.set("application.showFooter", !this.get("canLoadMore"));
} }
}); });

2
app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
View File

@@ -12,7 +12,7 @@ export function buildGroupPage(type) {
}, },
setupController(controller, model) { setupController(controller, model) {
this.controllerFor('group-activity-posts').setProperties({ model, type }); this.controllerFor('group-activity-posts').setProperties({ model, type, canLoadMore: true });
this.controllerFor("group").set("showing", type); this.controllerFor("group").set("showing", type);
}, },