Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 06:25:45 +01:00
Code Issues Packages Projects Releases Activity

correct error handling: groups and user permission can have the same name

Browse Source
This commit is contained in:
Maren Süwer
2018-09-25 09:22:31 +02:00
parent 225bb341d5
commit ab0f96db6b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-ui/public/locales/en/permissions.json
View File

@@ -24,6 +24,6 @@
"add-permission": { "add-permission": {
"add-permission-heading": "Add new Permission", "add-permission-heading": "Add new Permission",
"submit-button": "Submit", "submit-button": "Submit",
"name-input-invalid": "Permission for name already exists!" "name-input-invalid": "Permission already exists!"
} }
} }

6
scm-ui/src/repos/permissions/components/CreatePermissionForm.js
View File

@@ -82,7 +82,11 @@ class CreatePermissionForm extends React.Component<Props, State> {
currentPermissionIncludeName = () => { currentPermissionIncludeName = () => {
for (let i = 0; i < this.props.currentPermissions.length; i++) { for (let i = 0; i < this.props.currentPermissions.length; i++) {
if (this.props.currentPermissions[i].name === this.state.name) if (
this.props.currentPermissions[i].name === this.state.name &&
this.props.currentPermissions[i].groupPermission ==
this.state.groupPermission
)
return true; return true;
} }
return false; return false;