Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Merge pull request #6126 from sebgie/option-restore

Browse source 
Restore options
This commit is contained in:
Hannah Wolfe 2015-12-02 12:13:36 +08:00
commit 7ebc7f7ff1
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/server/models/user.js
View file

@ -245,6 +245,7 @@ User = ghostBookshelf.Model.extend({
findOne: function findOne(data, options) { findOne: function findOne(data, options) {
var query, var query,
status, status,
optInc,
lookupRole = data.role; lookupRole = data.role;
delete data.role; delete data.role;
@ -257,6 +258,7 @@ User = ghostBookshelf.Model.extend({
delete data.status; delete data.status;
options = options || {}; options = options || {};
optInc = options.include;
options.withRelated = _.union(options.withRelated, options.include); options.withRelated = _.union(options.withRelated, options.include);
data = this.filterData(data); data = this.filterData(data);
@ -285,6 +287,7 @@ User = ghostBookshelf.Model.extend({
options = this.filterOptions(options, 'findOne'); options = this.filterOptions(options, 'findOne');
delete options.include; delete options.include;
options.include = optInc;
return query.fetch(options); return query.fetch(options);
}, },