From 7ba3bf5cb56dd2746f2c2a21a6c1e717a23880eb Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 28 Mar 2018 14:03:16 +0200 Subject: [PATCH] review fix --- .../apps/settings/components/DefinitionActions.tsx | 1 - server/sonar-web/src/main/js/apps/settings/utils.js | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx b/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx index c5a4e796164..b8b74dd5ca0 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx @@ -32,7 +32,6 @@ type Props = { onReset: () => void; onSave: () => void; setting: SettingValue & { definition: Definition }; - valueChanged: boolean; }; type State = { reseting: boolean }; diff --git a/server/sonar-web/src/main/js/apps/settings/utils.js b/server/sonar-web/src/main/js/apps/settings/utils.js index b05eac7f43e..b7aa3a8e34a 100644 --- a/server/sonar-web/src/main/js/apps/settings/utils.js +++ b/server/sonar-web/src/main/js/apps/settings/utils.js @@ -115,16 +115,12 @@ function getParentValue(setting) { * @returns {string} */ export function getDefaultValue(setting) { - let parentValue = getParentValue(setting); + const parentValue = getParentValue(setting); if (parentValue == null) { - if (setting.definition.defaultValue) { - return setting.definition.defaultValue; - } - parentValue = getSettingValue(setting); - if (parentValue == null) { - return translate('settings.default.no_value'); - } + return setting.definition.defaultValue + ? setting.definition.defaultValue + : translate('settings.default.no_value'); } if (setting.definition.multiValues) { -- 2.39.5