From 6ef5fc53e4173b52f958469f42647dd061d77640 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 3 Feb 2016 16:57:57 +0100 Subject: [PATCH] rename permission "Provision Projects" to "Create Projects" --- .../src/main/java/org/sonar/server/project/ws/ProjectsWs.java | 2 +- .../java/org/sonar/server/project/ws/ProvisionedAction.java | 2 +- .../server/permission/ws/search_global_permissions-example.json | 2 +- .../server/permission/ws/SearchGlobalPermissionsActionTest.java | 2 +- server/sonar-web/test/json/permissions/global-permissions.json | 2 +- sonar-core/src/main/resources/org/sonar/l10n/core.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java index 038b2f28783..25a4e8a0e95 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java @@ -97,7 +97,7 @@ public class ProjectsWs implements WebService { private void defineCreateAction(NewController controller) { WebService.NewAction action = controller.createAction("create") - .setDescription("Provision a project. Requires Provision Projects permission") + .setDescription("Create a project. Requires Create Projects permission") .setSince("4.0") .setPost(true) .setHandler(RailsHandler.INSTANCE) diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java index a94678222e3..93be6278dfb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java @@ -56,7 +56,7 @@ public class ProvisionedAction implements ProjectsWsAction { .createAction("provisioned") .setDescription( "Get the list of provisioned projects.
" + - "Require 'Provision Projects' permission.") + "Require 'Create Projects' permission.") .setSince("5.2") .setResponseExample(Resources.getResource(getClass(), "projects-example-provisioned.json")) .setHandler(this) diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json index 25a11466f02..d5e519ab599 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json @@ -37,7 +37,7 @@ }, { "key": "provisioning", - "name": "Provision Projects", + "name": "Create Projects", "description": "Ability to initialize project structure before first analysis.", "usersCount": 1, "groupsCount": 1 diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java index 2f1651e9eca..23e444fde7e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java @@ -132,7 +132,7 @@ public class SearchGlobalPermissionsActionTest { i18n.put("global_permissions.scan", "Execute Analysis"); i18n.put("global_permissions.scan.desc", "Ability to execute analyses, and to get all settings required to perform the analysis, " + "even the secured ones like the scm account password, the jira account password, and so on."); - i18n.put("global_permissions.provisioning", "Provision Projects"); + i18n.put("global_permissions.provisioning", "Create Projects"); i18n.put("global_permissions.provisioning.desc", "Ability to initialize project structure before first analysis."); } diff --git a/server/sonar-web/test/json/permissions/global-permissions.json b/server/sonar-web/test/json/permissions/global-permissions.json index d1802cd2920..fa3562a995d 100644 --- a/server/sonar-web/test/json/permissions/global-permissions.json +++ b/server/sonar-web/test/json/permissions/global-permissions.json @@ -37,7 +37,7 @@ }, { "key": "provisioning", - "name": "Provision Projects", + "name": "Create Projects", "description": "Ability to initialize project structure before first analysis.", "usersCount": 0, "groupsCount": 1 diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 630e5e80512..54b342afeb5 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2840,7 +2840,7 @@ global_permissions.shareDashboard=Share Dashboards And Filters global_permissions.shareDashboard.desc=Ability to share dashboards, issue filters and measure filters. global_permissions.scan=Execute Analysis global_permissions.scan.desc=Ability to execute analyses, and to get all settings required to perform the analysis, even the secured ones like the scm account password, the jira account password, and so on. -global_permissions.provisioning=Provision Projects +global_permissions.provisioning=Create Projects global_permissions.provisioning.desc=Ability to initialize a project so its settings can be configured before the first analysis. #------------------------------------------------------------------------------ -- 2.39.5