Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 abed0edad -> 7f988970f


AMBARI-21678 Configs page doesnt load when switched to another service while 
Restart is in progress.(atkach)


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

Branch: refs/heads/branch-2.5
Commit: 7f988970ffdf48dd7dcfc6de93723f16bac0b3c1
Parents: abed0ed
Author: Andrii Tkach <atk...@apache.org>
Authored: Tue Aug 8 14:15:05 2017 +0300
Committer: Andrii Tkach <atk...@apache.org>
Committed: Tue Aug 8 14:15:05 2017 +0300

----------------------------------------------------------------------
 ambari-web/app/views/common/configs/config_history_flow.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f988970/ambari-web/app/views/common/configs/config_history_flow.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/config_history_flow.js 
b/ambari-web/app/views/common/configs/config_history_flow.js
index 929f082..110dcd3 100644
--- a/ambari-web/app/views/common/configs/config_history_flow.js
+++ b/ambari-web/app/views/common/configs/config_history_flow.js
@@ -82,7 +82,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
 
   isSaveDisabled: Em.computed.or('controller.isSubmitDisabled', 
'!controller.versionLoaded', '!controller.isPropertiesChanged'),
 
-  serviceName: Em.computed.alias('controller.selectedService.serviceName'),
+  serviceName: Em.computed.alias('controller.content.serviceName'),
 
   displayedServiceVersion: Em.computed.findBy('serviceVersions', 
'isDisplayed', true),
   /**
@@ -240,7 +240,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
         }
       });
       // if there is no current version in selected group show current version 
from default group
-      if (!currentIndex) {
+      if (!currentIndex && serviceVersions.length) {
         serviceVersions[isCurrentInDefaultGroupIndex].set('isDisplayed', true);
         currentIndex = isCurrentInDefaultGroupIndex + 1;
       }

Reply via email to