mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-26 20:34:02 +03:00
Get single post from API by id and query params; Auto-sort posts list
closes #2883, closes #2951 - introduce custom findQuery in ApplicationAdapter - posts/post route and editor/edit route now use custom findQuery to find a single post by id with query params - create a sorting function in PostsController for out-of-order loading - refresh updated posts in posts.index to make PostsList highlight latest draft after returning from a save in editor
This commit is contained in:
parent
772657ff26
commit
85f7e1d269
@ -9,6 +9,17 @@ var ApplicationAdapter = DS.RESTAdapter.extend({
|
||||
'X-CSRF-Token': $('meta[name="csrf-param"]').attr('content')
|
||||
},
|
||||
|
||||
findQuery: function (store, type, query) {
|
||||
var id;
|
||||
|
||||
if (query.id) {
|
||||
id = query.id;
|
||||
delete query.id;
|
||||
}
|
||||
|
||||
return this.ajax(this.buildURL(type.typeKey, id), 'GET', { data: query });
|
||||
},
|
||||
|
||||
buildURL: function (type, id) {
|
||||
// Ensure trailing slashes
|
||||
var url = this._super(type, id);
|
||||
|
@ -1,6 +1,47 @@
|
||||
import { getRequestErrorMessage } from 'ghost/utils/ajax';
|
||||
|
||||
var PostsController = Ember.ArrayController.extend({
|
||||
// this will cause the list to re-sort when any of these properties change on any of the models
|
||||
sortProperties: ['status', 'published_at', 'updated_at'],
|
||||
|
||||
// override Ember.SortableMixin
|
||||
//
|
||||
// this function will keep the posts list sorted when loading individual/bulk
|
||||
// models from the server, even if records in between haven't been loaded.
|
||||
// this can happen when reloading the page on the Editor or PostsPost routes.
|
||||
//
|
||||
// a custom sort function is needed in order to sort the posts list the same way the server would:
|
||||
// status: ASC
|
||||
// published_at: DESC
|
||||
// updated_at: DESC
|
||||
orderBy: function (item1, item2) {
|
||||
var status1 = item1.get('status'),
|
||||
status2 = item2.get('status'),
|
||||
|
||||
updatedAt1, updatedAt2,
|
||||
publishedAt1, publishedAt2;
|
||||
|
||||
if (status1 === status2) {
|
||||
if (status1 === 'draft') {
|
||||
updatedAt1 = item1.get('updated_at');
|
||||
updatedAt2 = item2.get('updated_at');
|
||||
|
||||
return (new Date(updatedAt1)) < (new Date(updatedAt2)) ? 1 : -1;
|
||||
} else {
|
||||
publishedAt1 = item1.get('published_at');
|
||||
publishedAt2 = item2.get('published_at');
|
||||
|
||||
return (new Date(publishedAt1)) < new Date(publishedAt2) ? 1 : -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (status2 === 'draft') {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return -1;
|
||||
},
|
||||
|
||||
// set from PostsRoute
|
||||
paginationSettings: null,
|
||||
|
||||
|
@ -21,9 +21,10 @@ var EditorEditRoute = AuthenticatedRoute.extend(styleBody, {
|
||||
return post;
|
||||
}
|
||||
|
||||
return this.store.filter('post', { status: 'all', staticPages: 'all' }, function (post) {
|
||||
//post.get('id') returns a string, so compare with params.post_id
|
||||
return post.get('id') === params.post_id;
|
||||
return this.store.find('post', {
|
||||
id: params.post_id,
|
||||
status: 'all',
|
||||
staticPages: 'all'
|
||||
}).then(function (records) {
|
||||
var post = records.get('firstObject');
|
||||
|
||||
|
@ -2,12 +2,16 @@ import AuthenticatedRoute from 'ghost/routes/authenticated';
|
||||
|
||||
var PostsIndexRoute = AuthenticatedRoute.extend({
|
||||
// redirect to first post subroute
|
||||
redirect: function () {
|
||||
var firstPost = (this.modelFor('posts') || []).get('firstObject');
|
||||
beforeModel: function () {
|
||||
var self = this;
|
||||
|
||||
if (firstPost) {
|
||||
this.transitionTo('posts.post', firstPost);
|
||||
}
|
||||
return this.store.find('post', {
|
||||
status: 'all',
|
||||
staticPages: 'all'
|
||||
}).then(function (records) {
|
||||
var post = records.get('firstObject');
|
||||
return self.transitionTo('posts.post', post);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -2,14 +2,36 @@ import AuthenticatedRoute from 'ghost/routes/authenticated';
|
||||
|
||||
var PostsPostRoute = AuthenticatedRoute.extend({
|
||||
model: function (params) {
|
||||
var post = this.modelFor('posts').findBy('id', params.post_id);
|
||||
var self = this,
|
||||
post,
|
||||
postId;
|
||||
|
||||
if (!post) {
|
||||
postId = Number(params.post_id);
|
||||
|
||||
if (!Number.isInteger(postId) || !Number.isFinite(postId) || postId <= 0) {
|
||||
this.transitionTo('posts.index');
|
||||
}
|
||||
|
||||
post = this.store.getById('post', postId);
|
||||
|
||||
if (post) {
|
||||
return post;
|
||||
}
|
||||
|
||||
return this.store.find('post', {
|
||||
id: params.post_id,
|
||||
status: 'all',
|
||||
staticPages: 'all'
|
||||
}).then(function (records) {
|
||||
var post = records.get('firstObject');
|
||||
|
||||
if (post) {
|
||||
return post;
|
||||
}
|
||||
|
||||
return self.transitionTo('posts.index');
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
export default PostsPostRoute;
|
||||
|
Loading…
Reference in New Issue
Block a user