From 8d39bc5a3c9a32a3449b529ffec68f28917375c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Tue, 14 Aug 2018 08:53:35 +0200 Subject: [PATCH] SONARCLOUD-112 Fix visibility badge tooltip for admins on My Projects page --- .../src/main/js/components/common/PrivacyBadgeContainer.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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'); -- 2.39.5