osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: Pagination while sorting on column headers

Browse Source
This commit is contained in:
Robin Ward
2013-11-14 12:35:18 -05:00
parent 07cbf8f4e3
commit 41dfcd2774
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/controllers/user_topics_list_controller.js
-4
View File
@@ -11,10 +11,6 @@ Discourse.UserTopicsListController = Discourse.ObjectController.extend({
actions: {
loadMore: function() {
this.get('model').loadMore();
},
changeSort: function() {
console.log('sort changed!');
}
}
app/assets/javascripts/discourse/models/topic_list.js
+8 -10
View File
@@ -71,7 +71,7 @@ Discourse.TopicList = Discourse.Model.extend({
topics.clear();
topics.pushObjects(newTopics);
self.set('loaded', true);
self.setProperties({ loaded: true, more_topics_url: result.topic_list.more_topics_url });
});
}.observes('sortOrder.order', 'sortOrder.descending'),
@@ -82,26 +82,24 @@ Discourse.TopicList = Discourse.Model.extend({
var moreUrl = this.get('more_topics_url');
if (moreUrl) {
var topicList = this;
var self = this;
this.set('loadingMore', true);
return Discourse.ajax({url: moreUrl}).then(function (result) {
var topicsAdded = 0;
if (result) {
// the new topics loaded from the server
var newTopics = Discourse.TopicList.topicsFrom(result);
var topics = topicList.get("topics");
var newTopics = Discourse.TopicList.topicsFrom(result),
topics = self.get("topics");
topicList.forEachNew(newTopics, function(t) {
self.forEachNew(newTopics, function(t) {
t.set('highlight', topicsAdded++ === 0);
topics.pushObject(t);
});
topicList.set('more_topics_url', result.topic_list.more_topics_url);
Discourse.Session.currentProp('topicList', topicList);
topicList.set('loadingMore', false);
return result.topic_list.more_topics_url;
self.setProperties({ loadingMore: false, more_topics_url: result.topic_list.more_topics_url });
Discourse.Session.currentProp('topicList', self);
return self.get('more_topics_url');
}
});
} else {