From: Grégoire Aubert Date: Fri, 3 Nov 2017 12:54:44 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/branch-6.7' X-Git-Tag: 7.0-RC1~385 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2634bf7e6e4f166f1c1fc3ad613d1cde62282f6d;p=sonarqube.git Merge remote-tracking branch 'origin/branch-6.7' --- 2634bf7e6e4f166f1c1fc3ad613d1cde62282f6d diff --cc server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx index 2c4cebc6a29,d2e8548ff72..9df1a73d51b --- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx @@@ -46,18 -47,57 +47,53 @@@ export default class SettingsEditionsNo () => {} ); + renderStatusMsg(edition?: Edition) { + const { editionStatus } = this.props; + return ( + + + - {edition ? ( - translateWithParameters( - 'marketplace.status_x.' + editionStatus.installationStatus, - edition.name - ) - ) : ( - translate('marketplace.status', editionStatus.installationStatus) - )} ++ {edition ++ ? translateWithParameters( ++ 'marketplace.status_x.' + editionStatus.installationStatus, ++ edition.name ++ ) ++ : translate('marketplace.status', editionStatus.installationStatus)} + + + ); + } + renderRestartMsg(edition?: Edition) { const { editionStatus, preventRestart } = this.props; return ( - {edition ? ( - translateWithParameters( - 'marketplace.status_x.' + editionStatus.installationStatus, - edition.name - ) - ) : ( - translate('marketplace.status', editionStatus.installationStatus) - )} + {edition + ? translateWithParameters( + 'marketplace.status_x.' + editionStatus.installationStatus, + edition.name + ) + : translate('marketplace.status', editionStatus.installationStatus)} + {edition && - edition.key === 'datacenter' && ( - - - {edition.name} - - ) - }} - /> - - )} ++ edition.key === 'datacenter' && ( ++ ++ ++ {edition.name} ++ ++ ) ++ }} ++ /> ++ ++ )} {!preventRestart && (