yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-12 15:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 1059

Browse Source
This commit is contained in:
Jim Laurie 2018-04-30 17:14:13 +02:00
parent f91be5ce63
commit 596adb5f61
8 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-admin/package.json
View File

@ -52,4 +52,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

2
packages/strapi-plugin-content-manager/config/layout.json
View File

@ -1 +1 @@
{}
{}

2
packages/strapi-plugin-content-manager/package.json
View File

@ -47,4 +47,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

2
packages/strapi-plugin-content-type-builder/package.json
View File

@ -51,4 +51,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

2
packages/strapi-plugin-settings-manager/package.json
View File

@ -48,4 +48,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

2
packages/strapi-plugin-upload/package.json
View File

@ -48,4 +48,4 @@
"npm": ">= 3.0.0"
},
"license": "MIT"
}
}

2
packages/strapi-plugin-users-permissions/package.json
View File

@ -55,4 +55,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

32
packages/strapi-utils/lib/models.js
View File

@ -140,30 +140,16 @@ module.exports = {
types.current = 'modelD';
// We have to find if they are a model linked to this key
_.forIn(_.omit(models, currentModelName || ''), model => {
Object.keys(model.attributes)
.filter(key => key === association.via)
.forEach(attr => {
const attribute = model.attributes[attr];
const model = models[association.model]
const attribute = model.attributes[association.via];
if (attribute.hasOwnProperty('via') && attribute.via === key && attribute.hasOwnProperty('collection') && attribute.collection !== '*') {
types.other = 'collection';
// Break loop
return false;
} else if (attribute.hasOwnProperty('model') && attribute.model !== '*') {
types.other = 'model';
// Break loop
return false;
} else if (attribute.hasOwnProperty('collection') || attribute.hasOwnProperty('model')) {
types.other = 'morphTo';
// Break loop
return false;
}
});
});
if (attribute.hasOwnProperty('via') && attribute.via === key && attribute.hasOwnProperty('collection') && attribute.collection !== '*') {
types.other = 'collection';
} else if (attribute.hasOwnProperty('model') && attribute.model !== '*') {
types.other = 'model';
} else if (attribute.hasOwnProperty('collection') || attribute.hasOwnProperty('model')) {
types.other = 'morphTo';
}
} else if (association.hasOwnProperty('model')) {
types.current = 'model';