ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject ambari git commit: AMBARI-18082. Dependent configs disappear without any warning (akovalenko)
Date Tue, 09 Aug 2016 13:48:44 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 e14daff36 -> f0f4b57db


AMBARI-18082. Dependent configs disappear without any warning (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0f4b57d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0f4b57d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0f4b57d

Branch: refs/heads/branch-2.4
Commit: f0f4b57db7b9b14763c85f54707eb581b5c2d3f9
Parents: e14daff
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Tue Aug 9 16:28:59 2016 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Aug 9 16:28:59 2016 +0300

----------------------------------------------------------------------
 .../app/controllers/main/service/info/configs.js | 19 +++++++++----------
 .../mixins/common/configs/enhanced_configs.js    |  6 +++++-
 2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f0f4b57d/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 89e8870..fec288d 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -477,16 +477,15 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.AddSecurityConfi
             if (serviceConfig) {
               var value = App.config.formatPropertyValue(serviceConfig, config.properties[prop]);
               var isFinal = !!(config.properties_attributes && config.properties_attributes.final
&& config.properties_attributes.final[prop]);
-              if (self.get('selectedConfigGroup.isDefault') || configGroup.get('name') ===
self.get('selectedConfigGroup.name')) {
-                var overridePlainObject = {
-                  "value": value,
-                  "savedValue": value,
-                  "isFinal": isFinal,
-                  "savedIsFinal": isFinal,
-                  "isEditable": self.get('canEdit') && configGroup.get('name') ===
self.get('selectedConfigGroup.name')
-                };
-                App.config.createOverride(serviceConfig, overridePlainObject, configGroup);
-              }
+              var overridePlainObject = {
+                "value": value,
+                "isVisible": self.get('selectedConfigGroup.isDefault') || configGroup.get('name')
=== self.get('selectedConfigGroup.name'),
+                "savedValue": value,
+                "isFinal": isFinal,
+                "savedIsFinal": isFinal,
+                "isEditable": self.get('canEdit') && configGroup.get('name') ===
self.get('selectedConfigGroup.name')
+              };
+              App.config.createOverride(serviceConfig, overridePlainObject, configGroup);
             } else {
               var isEditable = self.get('canEdit') && configGroup.get('name') ===
self.get('selectedConfigGroup.name');
               allConfigs.push(App.config.createCustomGroupConfig({

http://git-wip-us.apache.org/repos/asf/ambari/blob/f0f4b57d/ambari-web/app/mixins/common/configs/enhanced_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index bc2c956..46bdb46 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -300,9 +300,13 @@ App.EnhancedConfigsMixin = Em.Mixin.create(App.ConfigWithOverrideRecommendationP
 
   changedDependentGroup: function () {
     var dependentServices = this.get('selectedService.dependentServiceNames');
+    var isInstallWizard = this.get('content.controllerName') === 'installerController';
     var installedServices = App.Service.find().mapProperty('serviceName');
     var services = this.get('stepConfigs').filter(function (stepConfig) {
-      return installedServices.contains(stepConfig.get('serviceName')) && dependentServices.contains(stepConfig.get('serviceName'));
+      if (dependentServices.contains(stepConfig.get('serviceName'))) {
+        return isInstallWizard ? true : installedServices.contains(stepConfig.get('serviceName'));
+      }
+      return false;
     }, this);
     App.showSelectGroupsPopup(this.get('selectedService.serviceName'),
         this.get('selectedService.configGroups').findProperty('name', this.get('selectedConfigGroup.name')),


Mime
View raw message