diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml index da11b5164a..4823cb5f4f 100644 --- a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml +++ b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml @@ -34,10 +34,10 @@ - configuration:read:git + configuration:read,write:git - configuration:write:git + repository:git:* diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml new file mode 100644 index 0000000000..6c93929625 --- /dev/null +++ b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml @@ -0,0 +1,7 @@ + + + git + + + + diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json index cd88897e74..578d859c8e 100644 --- a/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json +++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json @@ -39,18 +39,28 @@ }, "permissions" : { "configuration": { - "read": { + "read,write": { "git": { - "displayName": "Git Konfiguration lesen", - "description": "Darf die git Konfiguration lesen." - } - }, - "write": { - "git": { - "displayName": "Git Konfiguration schreiben", + "displayName": "Git Konfiguration ändern", "description": "Darf die git Konfiguration verändern." } } + }, + "repository": { + "git": { + "*": { + "displayName": "Repository-spezifische Git Konfiguration ändern", + "description": "Darf die git Konfiguration für alle Repositories verändern." + } + } + } + }, + "verbs": { + "repository": { + "git": { + "displayName": "Git konfigurieren", + "description": "Darf die git Konfiguration für dieses Repository verändern." + } } } } diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json index 551573fb72..4bc93c62b1 100644 --- a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json +++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json @@ -39,18 +39,28 @@ }, "permissions" : { "configuration": { - "read": { + "read,write": { "git": { - "displayName": "Read git configuration", - "description": "May read the git configuration" - } - }, - "write": { - "git": { - "displayName": "Write git configuration", + "displayName": "Modify git configuration", "description": "May change the git configuration" } } + }, + "repository": { + "git": { + "*": { + "displayName": "Modify repository specific git configuration", + "description": "May change the git configuration for repositories" + } + } + } + }, + "verbs": { + "repository": { + "git": { + "displayName": "Configure Git", + "description": "May change the git configuration for this repository" + } } } } diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml index 205e8cc770..951bca4d76 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml +++ b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml @@ -34,10 +34,10 @@ - configuration:read:hg + configuration:read,write:hg - configuration:write:hg + repository:hg:* diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml new file mode 100644 index 0000000000..3b83051504 --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml @@ -0,0 +1,7 @@ + + + hg + + + + diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json b/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json index 37d6d4be2a..63a8cc8a98 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json +++ b/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json @@ -31,18 +31,28 @@ }, "permissions" : { "configuration": { - "read": { + "read,write": { "hg": { - "displayName": "Mercurial Konfiguration lesen", - "description": "Darf die Mercurial Konfiguration lesen" - } - }, - "write": { - "hg": { - "displayName": "Mercurial Konfiguration schreiben", + "displayName": "Mercurial Konfiguration ändern", "description": "Darf die Mercurial Konfiguration verändern" } } + }, + "repository": { + "hg": { + "*": { + "displayName": "Repository-spezifische Mercurial Konfiguration ändern", + "description": "Darf die Mercurial Konfiguration für alle Repositories verändern." + } + } + } + }, + "verbs": { + "repository": { + "hg": { + "displayName": "Mercurial konfigurieren", + "description": "Darf die Mercurial Konfiguration für dieses Repository verändern." + } } } } diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json index 61340ab9cf..2717ad3752 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json +++ b/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json @@ -31,18 +31,28 @@ }, "permissions" : { "configuration": { - "read": { + "read,write": { "hg": { - "displayName": "Read Mercurial configuration", - "description": "May read the Mercurial configuration" - } - }, - "write": { - "hg": { - "displayName": "Write Mercurial configuration", + "displayName": "Modify Mercurial configuration", "description": "May change the Mercurial configuration" } } + }, + "repository": { + "hg": { + "*": { + "displayName": "Modify repository specific Mercurial configuration", + "description": "May change the Mercurial configuration for repositories" + } + } + } + }, + "verbs": { + "repository": { + "hg": { + "displayName": "Configure Mercurial", + "description": "May change the Mercurial configuration for this repository" + } } } } diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml index 3da3526f93..602b1606e6 100644 --- a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml +++ b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml @@ -34,10 +34,10 @@ - configuration:read:svn + configuration:read,write:svn - configuration:write:svn + repository:svn:* diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml new file mode 100644 index 0000000000..7c7cd48b79 --- /dev/null +++ b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml @@ -0,0 +1,7 @@ + + + svn + + + + diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/locales/de/plugins.json b/scm-plugins/scm-svn-plugin/src/main/resources/locales/de/plugins.json index 58a18482b2..1b27a23564 100644 --- a/scm-plugins/scm-svn-plugin/src/main/resources/locales/de/plugins.json +++ b/scm-plugins/scm-svn-plugin/src/main/resources/locales/de/plugins.json @@ -25,18 +25,28 @@ }, "permissions": { "configuration": { - "read": { + "read,write": { "svn": { - "displayName": "Subversion Konfiguration lesen", - "description": "Darf die Subversion Konfiguration lesen" - } - }, - "write": { - "svn": { - "displayName": "Subversion Konfiguration schreiben", + "displayName": "Subversion Konfiguration ändern", "description": "Darf die Subversion Konfiguration verändern" } } + }, + "repository": { + "svn": { + "*": { + "displayName": "Repository-spezifische Subversion Konfiguration ändern", + "description": "Darf die Subversion Konfiguration für alle Repositories verändern." + } + } + } + }, + "verbs": { + "repository": { + "svn": { + "displayName": "Subversion konfigurieren", + "description": "Darf die Subversion Konfiguration für dieses Repository verändern." + } } } } diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json index a796027afc..13d7135818 100644 --- a/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json +++ b/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json @@ -25,18 +25,28 @@ }, "permissions": { "configuration": { - "read": { + "read,write": { "svn": { - "displayName": "Read Subversion configuration", - "description": "May read the Subversion configuration" + "displayName": "Modify Subversion configuration", + "description": "May modify the Subversion configuration" } - }, - "write": { - "svn": { - "displayName": "Write Subversion configuration", - "description": "May change the Subversion configuration" + } + }, + "repository": { + "svn": { + "*": { + "displayName": "Modify repository specific Subversion configuration", + "description": "May change the Subversion configuration for repositories" } } } + }, + "verbs": { + "repository": { + "svn": { + "displayName": "Configure Subversion", + "description": "May change the Subversion configuration for this repository" + } + } } } 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 b86199d700..ca7fd5a9c7 100644 --- a/scm-webapp/src/main/resources/META-INF/scm/permissions.xml +++ b/scm-webapp/src/main/resources/META-INF/scm/permissions.xml @@ -40,7 +40,7 @@ repository:read,pull,push:* - repository:*:* + repository:* repository:create @@ -51,5 +51,11 @@ group:* + + configuration:read,write:global + + + configuration:read,write:* + diff --git a/scm-webapp/src/main/resources/locales/de/plugins.json b/scm-webapp/src/main/resources/locales/de/plugins.json index 96eb8e8e9b..2b70fb85d5 100644 --- a/scm-webapp/src/main/resources/locales/de/plugins.json +++ b/scm-webapp/src/main/resources/locales/de/plugins.json @@ -14,10 +14,8 @@ } }, "*": { - "*": { - "displayName": "Alle Repositories besitzen (Owner)", - "description": "Darf alle Repositories lesen, klonen, schreiben, konfigurieren und löschen." - } + "displayName": "Alle Repositories besitzen (Owner)", + "description": "Darf alle Repositories lesen, klonen, schreiben, konfigurieren und löschen." }, "create": { "displayName": "Repositories erstellen", @@ -36,6 +34,18 @@ "description": "Darf Gruppen administrieren." } }, + "configuration": { + "read,write": { + "global": { + "displayName": "zentrale Konfiguration", + "description": "Darf die Konfiguration des SCM-Manager anpassen" + }, + "*": { + "displayName": "zentrale + Plugin Konfiguration", + "description": "Darf die Konfiguration des SCM-Manager und aller Plugins anpassen" + } + } + }, "unknown": "Unbekannte Berechtigung" }, "verbs": { @@ -68,10 +78,6 @@ "displayName": "Berechtigungen modifizieren", "description": "Darf die Berechtigungen des Repository bearbeiten." }, - "healthCheck": { - "displayName": "Health Check", - "description": "Darf den Repository Health Check ausführen." - }, "*": { "displayName": "Alle Repository Rechte", "description": "Darf im Repository Kontext alles ausführen. Dies beinhaltet alle Repository Berechtigungen." diff --git a/scm-webapp/src/main/resources/locales/en/plugins.json b/scm-webapp/src/main/resources/locales/en/plugins.json index a0472f18a2..b704daa274 100644 --- a/scm-webapp/src/main/resources/locales/en/plugins.json +++ b/scm-webapp/src/main/resources/locales/en/plugins.json @@ -14,10 +14,8 @@ } }, "*": { - "*": { - "displayName": "Own all repositories", - "description": "May see, clone, push to, configure and delete all repositories" - } + "displayName": "Own all repositories", + "description": "May see, clone, push to, configure and delete all repositories" }, "create": { "displayName": "Create repositories", @@ -36,6 +34,18 @@ "description": "May administer all groups" } }, + "configuration": { + "read,write": { + "global": { + "displayName": "Administer core", + "description": "May configure core settings of SCM-Manager" + }, + "*": { + "displayName": "Administer core and plugins", + "description": "May configure settings of SCM-Manager core and all plugins" + } + } + }, "unknown": "Unknown permission" }, "verbs": {