]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-10135 Allow to change Quality Gate permission at organization level
authorGrégoire Aubert <gregoire.aubert@sonarsource.com>
Wed, 29 Nov 2017 16:18:23 +0000 (17:18 +0100)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Thu, 14 Dec 2017 16:03:35 +0000 (17:03 +0100)
server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx

index b9ee74940d05c322e40092780fac683bb69337e9..913058f2e88b6f48558a677b666c127c53bf4d7e 100644 (file)
@@ -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),