From ab0f96db6bfa17e810170401f69528f4c4899b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Tue, 25 Sep 2018 09:22:31 +0200
Subject: [PATCH] correct error handling: groups and user permission can have
 the same name

---
 scm-ui/public/locales/en/permissions.json                   | 2 +-
 .../repos/permissions/components/CreatePermissionForm.js    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scm-ui/public/locales/en/permissions.json b/scm-ui/public/locales/en/permissions.json
index d1639ec6f8..95d7c785ee 100644
--- a/scm-ui/public/locales/en/permissions.json
+++ b/scm-ui/public/locales/en/permissions.json
@@ -24,6 +24,6 @@
   "add-permission": {
     "add-permission-heading": "Add new Permission",
     "submit-button": "Submit",
-    "name-input-invalid": "Permission for name already exists!"
+    "name-input-invalid": "Permission already exists!"
   }
 }
diff --git a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js
index 2697673a61..7b0bb46d74 100644
--- a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js
+++ b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js
@@ -82,7 +82,11 @@ class CreatePermissionForm extends React.Component<Props, State> {
 
   currentPermissionIncludeName = () => {
     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 false;