From 4229eefca7191874cb05a238a0c079562635a704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 1 Mar 2019 11:30:58 +0100
Subject: [PATCH 1/2] Add permission for permissions

---
 scm-webapp/src/main/resources/META-INF/scm/permissions.xml | 3 +++
 scm-webapp/src/main/resources/locales/de/plugins.json      | 6 ++++++
 scm-webapp/src/main/resources/locales/en/plugins.json      | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/scm-webapp/src/main/resources/META-INF/scm/permissions.xml b/scm-webapp/src/main/resources/META-INF/scm/permissions.xml
index 0ec51141b4..6b7f7bd99f 100644
--- a/scm-webapp/src/main/resources/META-INF/scm/permissions.xml
+++ b/scm-webapp/src/main/resources/META-INF/scm/permissions.xml
@@ -51,6 +51,9 @@
   <permission>
     <value>group:*</value>
   </permission>
+  <permission>
+    <value>permission:*</value>
+  </permission>
   <permission>
     <value>configuration:list</value>
   </permission>
diff --git a/scm-webapp/src/main/resources/locales/de/plugins.json b/scm-webapp/src/main/resources/locales/de/plugins.json
index 8c2015a0e8..6c6a383fe5 100644
--- a/scm-webapp/src/main/resources/locales/de/plugins.json
+++ b/scm-webapp/src/main/resources/locales/de/plugins.json
@@ -34,6 +34,12 @@
         "description": "Darf Gruppen administrieren."
       }
     },
+    "permission": {
+      "*": {
+        "displayName": "Berechtigungen verwalten",
+        "description": "Darf Berechtigungen verwalten (benötigt zusätzlich 'Benutzer administrieren' bzw. 'Gruppen administrieren')."
+      }
+    },
     "configuration": {
       "list": {
         "displayName": "Basis für Administration",
diff --git a/scm-webapp/src/main/resources/locales/en/plugins.json b/scm-webapp/src/main/resources/locales/en/plugins.json
index 03eb06e597..7efcbbe39c 100644
--- a/scm-webapp/src/main/resources/locales/en/plugins.json
+++ b/scm-webapp/src/main/resources/locales/en/plugins.json
@@ -34,6 +34,12 @@
         "description": "May administer all groups"
       }
     },
+    "permission": {
+      "*": {
+        "displayName": "Administer permissions",
+        "description": "May administer permissions (additionally needs 'administer users' and/or 'administer groups')."
+      }
+    },
     "configuration": {
       "list": {
         "displayName": "Basic administration",

From e0b9aa0bb37aa23dd8bda55f368e76afcd26de6a Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Fri, 1 Mar 2019 12:28:08 +0000
Subject: [PATCH 2/2] Close branch bugfix/administer_permissions