yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-26 18:38:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove functions from model attributes

Browse Source
This commit is contained in:
Aurélien Georget 2015-11-13 14:08:18 +01:00
parent 3557a00940
commit c42e3eff8b
1 changed files with 155 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/configuration/hooks/studio/index.js
View File

@ -62,7 +62,6 @@ module.exports = function (strapi) {
] ]
}); });
process.nextTick(function () {
manager.on('connect_failed', function () { manager.on('connect_failed', function () {
if (firstConnectionAttempt) { if (firstConnectionAttempt) {
strapi.log.warn('Connection to the Studio server failed!'); strapi.log.warn('Connection to the Studio server failed!');
@ -152,6 +151,7 @@ module.exports = function (strapi) {
.then(function () { .then(function () {
if (data.hasOwnProperty('action') && _.isFunction(_self[data.action])) { if (data.hasOwnProperty('action') && _.isFunction(_self[data.action])) {
_self[data.action](data, function (err, obj) { _self[data.action](data, function (err, obj) {
if (err) { if (err) {
fn({ fn({
appId: strapi.config.studio.appId, appId: strapi.config.studio.appId,
@ -221,6 +221,8 @@ module.exports = function (strapi) {
return false; return false;
} }
fn({ fn({
appId: strapi.config.studio.appId, appId: strapi.config.studio.appId,
token: strapi.token, token: strapi.token,
@ -248,7 +250,6 @@ module.exports = function (strapi) {
socket.on('err', function (data) { socket.on('err', function (data) {
strapi.log.warn(data.text); strapi.log.warn(data.text);
}); });
});
cb(); cb();
} else { } else {
@ -318,12 +319,23 @@ module.exports = function (strapi) {
*/ */
pullServer: function (data, cb) { pullServer: function (data, cb) {
const obj = {}; const obj = {
obj.token = strapi.token; token: strapi.token,
obj.config = strapi.config; config: strapi.config,
obj.models = strapi.models; models: _.mapValues(_.cloneDeep(strapi.models), function (model) {
obj.api = strapi.api; model.attributes = _.omit(model.attributes, _.isFunction);
obj.templates = {};
return model;
}),
api: _.mapValues(_.cloneDeep(strapi.api), function (api) {
return _.mapValues(api.models, function (model) {
model.attributes = _.omit(model.attributes, _.isFunction);
return model;
});
}),
templates: {}
};
cb(null, obj); cb(null, obj);
}, },