TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 03:44:29 +03:00
Code Issues Projects Releases Wiki Activity

Updated base model to remove extraAllowedProperties

Browse Source 
refs #9881

This is because when extending these methods, you need to know the
contents of the extraAllowedProperties to replicate it in the subclass,
breaking the principle of open/closed.
This commit is contained in:
Fabien O'Carroll 2018-09-20 19:58:57 +07:00 committed by Katharina Irrgang
parent b913618c03
commit b326cfaab7
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/server/models/base/index.js
View File

@ -498,12 +498,18 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @return {Object} Keys allowed in the `options` hash of every model's method.
*/
permittedOptions: function permittedOptions(methodName) {
if (methodName === 'toJSON') {
return ['shallow', 'withRelated', 'context', 'columns', 'absolute_urls'];
}
const baseOptions = ['context', 'withRelated'];
const extraOptions = ['transacting', 'importing', 'forUpdate', 'migrating'];
// terms to whitelist for all methods.
return ['context', 'withRelated', 'transacting', 'importing', 'forUpdate', 'migrating'];
switch (methodName) {
case 'toJSON':
return baseOptions.concat('shallow', 'columns', 'absolute_urls');
case 'destroy':
case 'edit':
return baseOptions.concat(extraOptions, ['id']);
default:
return baseOptions.concat(extraOptions);
}
},
/**
@ -753,9 +759,9 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @return {Promise(ghostBookshelf.Model)} Edited Model
*/
edit: function edit(data, unfilteredOptions) {
var options = this.filterOptions(unfilteredOptions, 'edit', {extraAllowedProperties: ['id']}),
id = options.id,
model = this.forge({id: id});
const options = this.filterOptions(unfilteredOptions, 'edit');
const id = options.id;
const model = this.forge({id: id});
data = this.filterData(data);
@ -804,8 +810,8 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @return {Promise(ghostBookshelf.Model)} Empty Model
*/
destroy: function destroy(unfilteredOptions) {
var options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']}),
id = options.id;
const options = this.filterOptions(unfilteredOptions, 'destroy');
const id = options.id;
// Fetch the object before destroying it, so that the changed data is available to events
return this.forge({id: id})