Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

✨ support object id's (#390)

Browse source 
refs TryGhost/Ghost#7494

- remove id validation
This commit is contained in:
Katharina Irrgang 2016-11-14 11:53:15 +01:00 • committed by Kevin Ansfield
parent a1707f3832
commit 2b0d0f841c
2 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ghost/admin/app/routes/editor/edit.js
View file

@ -1,8 +1,6 @@
/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */ /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
import AuthenticatedRoute from 'ghost-admin/routes/authenticated'; import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import base from 'ghost-admin/mixins/editor-base-route'; import base from 'ghost-admin/mixins/editor-base-route';
import isNumber from 'ghost-admin/utils/isNumber';
import isFinite from 'ghost-admin/utils/isFinite';
export default AuthenticatedRoute.extend(base, { export default AuthenticatedRoute.extend(base, {
titleToken: 'Editor', titleToken: 'Editor',
@ -14,20 +12,13 @@ export default AuthenticatedRoute.extend(base, {
}, },
model(params) { model(params) {
let postId, /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
query; let query = {
id: params.post_id,
postId = Number(params.post_id);
if (!isNumber(postId) || !isFinite(postId) || postId % 1 !== 0 || postId <= 0) {
return this.transitionTo('error404', `editor/${params.post_id}`);
}
query = {
id: postId,
status: 'all', status: 'all',
staticPages: 'all' staticPages: 'all'
}; };
/* jscs:enable requireCamelCaseOrUpperCaseIdentifiers */
return this.store.query('post', query).then((records) => { return this.store.query('post', query).then((records) => {
let post = records.get('firstObject'); let post = records.get('firstObject');

28
ghost/admin/app/routes/posts/post.js
View file

@ -1,32 +1,20 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated'; import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route'; import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
import isNumber from 'ghost-admin/utils/isNumber';
import isFinite from 'ghost-admin/utils/isFinite';
export default AuthenticatedRoute.extend(ShortcutsRoute, { export default AuthenticatedRoute.extend(ShortcutsRoute, {
model(params) { model(params) {
let post,
postId,
query;
/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */ /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
postId = Number(params.post_id); let post = this.store.peekRecord('post', params.post_id);
let query = {
if (!isNumber(postId) || !isFinite(postId) || postId % 1 !== 0 || postId <= 0) { id: params.post_id,
return this.transitionTo('error404', params.post_id);
}
/* jscs:enable requireCamelCaseOrUpperCaseIdentifiers */
post = this.store.peekRecord('post', postId);
if (post) {
return post;
}
query = {
id: postId,
status: 'all', status: 'all',
staticPages: 'all' staticPages: 'all'
}; };
/* jscs:enable requireCamelCaseOrUpperCaseIdentifiers */
if (post) {
return post;
}
return this.store.query('post', query).then((records) => { return this.store.query('post', query).then((records) => {
let post = records.get('firstObject'); let post = records.get('firstObject');