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

Merge pull request #2775 from riking/notification-hotfix

Browse Source 
FIX: Broken notification history
This commit is contained in:
Sam
2014-09-10 10:26:31 +10:00
parent 51d9a59d53 bf06878601
commit b2fe6f6cb2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/user-notifications.js.es6
View File

@@ -12,9 +12,10 @@ export default Ember.ArrayController.extend({
self.get('model.lastObject.created_at'), self.get('model.lastObject.created_at'),
self.get('user.username')).then(function(result) { self.get('user.username')).then(function(result) {
self.set('loading', false); self.set('loading', false);
self.pushObjects(result); var notifications = result.get('content');
self.pushObjects(notifications);
// Stop trying if it's the end // Stop trying if it's the end
if (result.length === 0) { if (notifications && notifications.length === 0) {
self.set('canLoadMore', false); self.set('canLoadMore', false);
} }
}).catch(function(error) { }).catch(function(error) {