aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2018-04-10 18:02:07 +0200
committerSonarTech <sonartech@sonarsource.com>2018-04-13 20:20:48 +0200
commit3ee8ec8dec07179ea5eb72cf7e3a5cc584f5734c (patch)
tree090aec31362dcdba232245a998ac65b9e3830c16 /server
parent05f2a1332ceae679ae8c0e13cb95bb1eb4eccd29 (diff)
downloadsonarqube-3ee8ec8dec07179ea5eb72cf7e3a5cc584f5734c.tar.gz
sonarqube-3ee8ec8dec07179ea5eb72cf7e3a5cc584f5734c.zip
SONAR-10569 Move update_project_visibility from organizations to permissions
Diffstat (limited to 'server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java7
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java2
2 files changed, 5 insertions, 4 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java
index 3a60efbdea1..629674ff0d9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java
@@ -39,7 +39,9 @@ public class OrganizationsWsModule extends Module {
OrganizationsWsSupport.class,
// actions
SearchAction.class,
- SearchMembersAction.class);
+ SearchMembersAction.class,
+ // Update of project visibility is used on on-premise instances, not only on SonarCloud / Organizations
+ UpdateProjectVisibilityAction.class);
if (config.getBoolean(SONARCLOUD_ENABLED.getKey()).orElse(false)) {
add(
EnableSupportAction.class,
@@ -47,8 +49,7 @@ public class OrganizationsWsModule extends Module {
CreateAction.class,
DeleteAction.class,
RemoveMemberAction.class,
- UpdateAction.class,
- UpdateProjectVisibilityAction.class);
+ UpdateAction.class);
}
}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java
index dc857653ccc..7f694da13de 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java
@@ -39,7 +39,7 @@ public class OrganizationsWsModuleTest {
underTest.configure(container);
assertThat(container.getPicoContainer().getComponentAdapters())
- .hasSize(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 4);
+ .hasSize(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 5);
}
@Test