yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-27 09:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-fetch-user

Browse Source
This commit is contained in:
Jim LAURIE 2018-11-27 16:53:00 +01:00 committed by GitHub
commit a39ec8c3ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js
View File

@ -42,17 +42,17 @@ class SettingsPage extends React.PureComponent {
if (curr !== 'plugins') { if (curr !== 'plugins') {
if (!data[curr].fields && _.isObject(data[curr])) { if (!data[curr].fields && _.isObject(data[curr])) {
return this.getModels(data[curr], `${destination}${curr}/`); return acc.concat(this.getModels(data[curr], `${destination}${curr}/`));
} }
return acc.concat([{ name: curr, destination: `${destination}${curr}` }]); return acc.concat([{ name: curr, destination: `${destination}${curr}` }]);
} }
return this.getModels(data[curr], `${destination}${curr}/`); return acc.concat(this.getModels(data[curr], `${destination}${curr}/`));
}, []); }, []);
return sortBy( return sortBy(
models.filter(obj => obj.name !== 'permission' && obj.name !== 'role'), models.filter(obj => !!this.props.schema.layout[obj.name]),
['name'], ['name'],
); );
} }