mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-25 18:51:40 +02:00
Code Issues Releases Wiki Activity

Still show index pane when a discussion is created

Browse Source
This commit is contained in:
Toby Zerner
2015-02-12 15:19:46 +10:30
parent 5229c5c06a
commit 681de4244b
3 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ember/app/controllers/index.js
View File

@@ -24,7 +24,7 @@ export default Ember.Controller.extend(UseComposer, Paneable, {
var controller = this; var controller = this;
return this.saveAndDismissComposer(discussion).then(function(discussion) { return this.saveAndDismissComposer(discussion).then(function(discussion) {
controller.get('index').set('model', null).send('refresh'); controller.get('index').send('refresh');
controller.transitionToRoute('discussion', discussion); controller.transitionToRoute('discussion', discussion);
}); });
}, },

186
ember/app/controllers/index/index.js
View File

@@ -4,111 +4,123 @@ import DiscussionResult from 'flarum/models/discussion-result';
import PostResult from 'flarum/models/post-result'; import PostResult from 'flarum/models/post-result';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
needs: ['application'], needs: ['application'],
queryParams: ['sort', 'show', {searchQuery: 'q'}, 'filter'], queryParams: ['sort', 'show', {searchQuery: 'q'}, 'filter'],
sort: 'recent', sort: 'recent',
show: 'discussions', show: 'discussions',
filter: '', filter: '',
searchQuery: '', searchQuery: '',
meta: null, meta: null,
resultsLoading: false, resultsLoading: false,
sortOptions: [ sortOptions: [
{key: 'recent', label: 'Recent', sort: 'recent'}, {key: 'recent', label: 'Recent', sort: 'recent'},
{key: 'replies', label: 'Replies', sort: '-replies'}, {key: 'replies', label: 'Replies', sort: '-replies'},
{key: 'newest', label: 'Newest', sort: '-created'}, {key: 'newest', label: 'Newest', sort: '-created'},
{key: 'oldest', label: 'Oldest', sort: 'created'}, {key: 'oldest', label: 'Oldest', sort: 'created'},
], ],
terminalPostType: Ember.computed('sort', function() { terminalPostType: Ember.computed('sort', function() {
return ['newest', 'oldest'].indexOf(this.get('sort')) !== -1 ? 'start' : 'last'; return ['newest', 'oldest'].indexOf(this.get('sort')) !== -1 ? 'start' : 'last';
}), }),
countType: Ember.computed('sort', function() { countType: Ember.computed('sort', function() {
return this.get('sort') === 'replies' ? 'replies' : 'unread'; return this.get('sort') === 'replies' ? 'replies' : 'unread';
}), }),
moreResults: Ember.computed.bool('meta.moreUrl'), moreResults: Ember.computed.bool('meta.moreUrl'),
getResults: function(start) { getResults: function(start) {
var searchQuery = this.get('searchQuery');
var sort = this.get('sort');
var sortOptions = this.get('sortOptions');
var sortOption = sortOptions.findBy('key', sort) || sortOptions.objectAt(0);
var params = {
sort: sortOption.sort,
q: searchQuery,
start: start
};
if (this.get('show') === 'posts') {
if (searchQuery) {
params.include = 'relevantPosts';
} else if (sort === 'created') {
params.include = 'startPost,startUser';
} else {
params.include = 'lastPost,lastUser';
}
}
return this.store.find('discussion', params).then(function(discussions) {
var results = Ember.A();
discussions.forEach(function(discussion) {
var relevantPosts = Ember.A();
// discussion.get('relevantPosts.content').forEach(function(post) {
// relevantPosts.pushObject(PostResult.create(post));
// });
results.pushObject(DiscussionResult.create({
content: discussion,
relevantPosts: relevantPosts,
lastPost: PostResult.create(discussion.get('lastPost')),
startPost: PostResult.create(discussion.get('startPost'))
}));
results.set('meta', discussions.get('meta'));
});
return results;
});
},
searchQueryDidChange: Ember.observer('searchQuery', function() {
var searchQuery = this.get('searchQuery'); var searchQuery = this.get('searchQuery');
this.get('controllers.application').setProperties({ var sort = this.get('sort');
var sortOptions = this.get('sortOptions');
var sortOption = sortOptions.findBy('key', sort) || sortOptions.objectAt(0);
var params = {
sort: sortOption.sort,
q: searchQuery,
start: start
};
if (this.get('show') === 'posts') {
if (searchQuery) {
params.include = 'relevantPosts';
} else if (sort === 'created') {
params.include = 'startPost,startUser';
} else {
params.include = 'lastPost,lastUser';
}
}
return this.store.find('discussion', params).then(function(discussions) {
var results = Ember.A();
discussions.forEach(function(discussion) {
var relevantPosts = Ember.A();
// discussion.get('relevantPosts.content').forEach(function(post) {
// relevantPosts.pushObject(PostResult.create(post));
// });
results.pushObject(DiscussionResult.create({
content: discussion,
relevantPosts: relevantPosts,
lastPost: PostResult.create(discussion.get('lastPost')),
startPost: PostResult.create(discussion.get('startPost'))
}));
results.set('meta', discussions.get('meta'));
});
return results;
});
},
searchQueryDidChange: Ember.observer('searchQuery', function() {
var searchQuery = this.get('searchQuery');
this.get('controllers.application').setProperties({
searchQuery: searchQuery, searchQuery: searchQuery,
searchActive: !!searchQuery searchActive: !!searchQuery
}); });
var sortOptions = this.get('sortOptions'); var sortOptions = this.get('sortOptions');
if (this.get('searchQuery') && sortOptions[0].sort !== 'relevance') { if (this.get('searchQuery') && sortOptions[0].sort !== 'relevance') {
sortOptions.unshiftObject({key: 'relevance', label: 'Relevance', sort: 'relevance'}); sortOptions.unshiftObject({key: 'relevance', label: 'Relevance', sort: 'relevance'});
} else if (!this.get('searchQuery') && sortOptions[0].sort === 'relevance') { } else if (!this.get('searchQuery') && sortOptions[0].sort === 'relevance') {
sortOptions.shiftObject(); sortOptions.shiftObject();
} }
}), }),
paramsDidChange: Ember.observer('sort', 'show', 'searchQuery', function() { paramsDidChange: Ember.observer('sort', 'show', 'searchQuery', function() {
if (this.get('model')) { if (this.get('model')) {
this.send('refresh'); this.send('refresh');
} }
}), }),
actions: { actions: {
loadMore: function() { loadMore: function() {
var controller = this; var controller = this;
this.set('resultsLoading', true); this.set('resultsLoading', true);
this.getResults(this.get('model.length')).then(function(results) { this.getResults(this.get('model.length')).then(function(results) {
controller.get('model').addObjects(results); controller.get('model').addObjects(results);
controller.set('meta', results.get('meta')); controller.set('meta', results.get('meta'));
controller.set('resultsLoading', false); controller.set('resultsLoading', false);
}); });
}, },
discussionRemoved: function(discussion) { discussionRemoved: function(discussion) {
var model = this.get('model'); var model = this.get('model');
model.removeObject(model.findBy('content', discussion)); model.removeObject(model.findBy('content', discussion));
},
refresh: function() {
var controller = this;
controller.set('model', Ember.ArrayProxy.create());
controller.set('resultsLoading', true);
controller.getResults().then(function(results) {
controller
.set('resultsLoading', false)
.set('meta', results.get('meta'))
.set('model.content', results);
});
} }
} }
}); });

8
ember/app/routes/index/index.js
View File

@@ -16,13 +16,7 @@ export default Ember.Route.extend(AddCssClassToBody, {
controller.set('model', model); controller.set('model', model);
if (!model.get('length')) { if (!model.get('length')) {
controller.set('resultsLoading', true); controller.send('refresh');
controller.getResults().then(function(results) {
controller
.set('resultsLoading', false)
.set('meta', results.get('meta'))
.set('model.content', results);
});
} }
}, },