review fix

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 c5a4e796164900d2138e92bcba9e55a75600ee56..b8b74dd5ca09d0d11e8d5f39831d98d0c05cf3b3 100644 (file)
--- 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 b05eac7f43ed685ba898e40d2b8fe6e560fa9315..b7aa3a8e34a3807f2191553886a7fb0b92c67fd7 100644 (file)
--- 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) {