From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Wed, 29 Nov 2017 16:18:23 +0000 (+0100)
Subject: SONAR-10135 Allow to change Quality Gate permission at organization level
X-Git-Tag: 7.0-RC1~154
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c4b2c3d7050c3639ec7672e1ba8b6dd266bd59dc;p=sonarqube.git

SONAR-10135 Allow to change Quality Gate permission at organization level
---

diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx
index b9ee74940d0..913058f2e88 100644
--- a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx
+++ b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx
@@ -25,7 +25,6 @@ import { Organization } from '../../../../app/types';
 import { PermissionUser, PermissionGroup } from '../../../../api/permissions';
 
 const PERMISSIONS_ORDER = ['admin', 'profileadmin', 'gateadmin', 'scan', 'provisioning'];
-const PERMISSIONS_FOR_CUSTOM_ORG = ['admin', 'profileadmin', 'scan', 'provisioning'];
 
 interface Props {
   filter: string;
@@ -70,13 +69,8 @@ export default class AllHoldersList extends React.PureComponent<Props> {
   };
 
   render() {
-    const order =
-      this.props.organization && !this.props.organization.isDefault
-        ? PERMISSIONS_FOR_CUSTOM_ORG
-        : PERMISSIONS_ORDER;
-
+    const order = PERMISSIONS_ORDER;
     const l10nPrefix = this.props.organization ? 'organizations_permissions' : 'global_permissions';
-
     const permissions = order.map(p => ({
       key: p,
       name: translate(l10nPrefix, p),