From: Grégoire Aubert Date: Tue, 14 Aug 2018 06:53:35 +0000 (+0200) Subject: SONARCLOUD-112 Fix visibility badge tooltip for admins on My Projects page X-Git-Tag: 7.5~587 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d39bc5a3c9a32a3449b529ffec68f28917375c3;p=sonarqube.git SONARCLOUD-112 Fix visibility badge tooltip for admins on My Projects page --- diff --git a/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx b/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx index 14347621bd5..2c702af7c02 100644 --- a/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx +++ b/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx @@ -114,15 +114,16 @@ export default connect(mapStateToProps)(PrivacyBadge function getDoc(visibility: Visibility, icon: JSX.Element | null, organization: Organization) { let doc; + const canAdmin = organization.canAdmin || organization.isAdmin; if (visibility === Visibility.Private) { doc = import(/* webpackMode: "eager" */ 'Docs/tooltips/project/visibility-private.md'); } else if (icon) { - if (organization.canAdmin) { + if (canAdmin) { doc = import(/* webpackMode: "eager" */ 'Docs/tooltips/project/visibility-public-paid-org-admin.md'); } else { doc = import(/* webpackMode: "eager" */ 'Docs/tooltips/project/visibility-public-paid-org.md'); } - } else if (organization.canAdmin) { + } else if (canAdmin) { doc = import(/* webpackMode: "eager" */ 'Docs/tooltips/project/visibility-public-admin.md'); } else { doc = import(/* webpackMode: "eager" */ 'Docs/tooltips/project/visibility-public.md');