[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, while g… (#1853)

[is...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by this push:
     new 6e4a5d1  [AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, while g… (#1853)
6e4a5d1 is described below

commit 6e4a5d123da37ae35b83a12f55ef618fa7b8c72d
Author: Ishan Bhatt <is...@gmail.com>
AuthorDate: Wed Jul 25 09:25:58 2018 -0700

    [AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, while g… (#1853)
    
    * [AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, while getting configs for service.
    
    * Removing the commented out code
---
 ambari-web/app/controllers/wizard/step7_controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 8e623f0..f66fece 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -2153,7 +2153,9 @@ App.WizardStep7Controller = App.WizardStepController.extend(App.ServerValidatorM
   },
 
   updateConfigAttributesFromThemes: function () {
-    this.get('allSelectedServiceNames').forEach(serviceName => this.updateAttributesFromTheme(serviceName));
+    App.config.get('preDefinedServiceConfigs').mapProperty('serviceName')
+      .filter(serviceName => this.get('allSelectedServiceNames').contains(serviceName))
+      .forEach(serviceName => this.updateAttributesFromTheme(serviceName));
   },
 
   validateOnTabSwitch: function () {