yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display better error message & lock fields

Browse Source
This commit is contained in:
Aurelsicoko 2018-01-25 18:12:29 +01:00
parent 7862899ed6
commit 8a66873405
7 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-helper-plugin/lib/src/utils/request.js
View File

@ -150,5 +150,5 @@ export default function request(url, options = {}, shouldWatchServerRestart = fa
}
return response;
});
});
}

3
packages/strapi-plugin-content-manager/config/queries/mongoose.js
View File

@ -31,7 +31,8 @@ module.exports = {
return acc;
}, {}))
.catch((err) => {
const field = _.last(_.words(err.message.split('_')[0]));
const message = err.message.split('index:');
const field = _.words(_.last(message).split('_')[0]);
const error = { message: `This ${field} is already taken`, field };
throw error;

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

@ -3,4 +3,4 @@
"unique_email": true,
"allow_register": true
}
}
}

11
packages/strapi-plugin-users-permissions/config/queries/mongoose.js
View File

@ -39,9 +39,14 @@ module.exports = {
return acc;
}, {}))
.catch((error) => {
const field = _.last(_.words(error.message.split('_')[0]));
const err = { message: `This ${field} is already taken`, field };
.catch((err) => {
if (err.message.indexOf('index:') !== -1) {
const message = err.message.split('index:');
const field = _.words(_.last(message).split('_')[0]);
const error = { message: `This ${field} is already taken`, field };
throw error;
}
throw err;
});

2
packages/strapi-plugin-users-permissions/controllers/Auth.js
View File

@ -189,7 +189,7 @@ module.exports = {
register: async (ctx) => {
if (!strapi.plugins['users-permissions'].config.advanced.allow_register) {
return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.advanced.allow_register' }] }] : 'Register action is actualy not available.');
return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.advanced.allow_register' }] }] : 'Register action is currently disabled.');
}
const params = _.assign(ctx.request.body, {

18
packages/strapi-plugin-users-permissions/models/Permission.settings.json
View File

@ -7,28 +7,34 @@
"attributes": {
"type": {
"type": "string",
"required": true
"required": true,
"configurable": false
},
"controller": {
"type": "string",
"required": true
"required": true,
"configurable": false
},
"action": {
"type": "string",
"required": true
"required": true,
"configurable": false
},
"enabled": {
"type": "boolean",
"required": true
"required": true,
"configurable": false
},
"policy": {
"type": "json",
"required": true
"required": true,
"configurable": false
},
"role": {
"model": "role",
"via": "permissions",
"plugin": "users-permissions"
"plugin": "users-permissions",
"configurable": false
}
}
}

15
packages/strapi-plugin-users-permissions/models/Role.settings.json
View File

@ -8,24 +8,29 @@
"name": {
"type": "string",
"minLength": 3,
"required": true
"required": true,
"configurable": false
},
"description": {
"type": "string"
"type": "string",
"configurable": false
},
"type": {
"type": "string",
"unique": true
"unique": true,
"configurable": false
},
"users": {
"collection": "user",
"via": "role",
"plugin": "users-permissions"
"plugin": "users-permissions",
"configurable": false
},
"permissions": {
"collection": "permission",
"via": "role",
"plugin": "users-permissions"
"plugin": "users-permissions",
"configurable": false
}
}
}