ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-16294. Disabling and enabling back HiveServer2 Interactive does not show Assign Master popup. (Jaimin)
Date Fri, 06 May 2016 23:37:45 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bd6eecce6 -> 178a350f6


AMBARI-16294. Disabling and enabling back HiveServer2 Interactive does not show Assign Master
popup. (Jaimin)


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

Branch: refs/heads/trunk
Commit: 178a350f6c35a54476715123aee50404b7e3659a
Parents: bd6eecc
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Fri May 6 16:37:04 2016 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Fri May 6 16:37:32 2016 -0700

----------------------------------------------------------------------
 .../service/configs/component_actions_by_configs.js     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/178a350f/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 93cac29..5e1eb50 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -53,7 +53,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
   /**
    * Get Component that will be deleted on saving configurations
    * @param configActionComponents {Object}
-   * @return {boolean}
+   * @return {array}
    * @private
    * @method getComponentsToDelete
    */
@@ -68,15 +68,19 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
   /**
    * Get Component that will be added on saving configurations
    * @param configActionComponents {Object}
-   * @return {boolean}
+   * @return {array}
    * @private
    * @method getComponentsToDelete
    */
   getComponentsToAdd: function(configActionComponents) {
     return configActionComponents.filterProperty('configActionComponent.action', 'add').map(function(item){
       return item.configActionComponent;
-    }).filter(function(_componentToAdd){
-      return  !App.HostComponent.find().filterProperty('componentName',_componentToAdd.componentName).someProperty('hostName',
_componentToAdd.hostName);
+    }).filter(function(_componentToAdd) {
+      var serviceNameForcomponent = App.StackServiceComponent.find().findProperty('componentName',_componentToAdd.componentName).get('serviceName');
+      // List of host components to be added should not include ones that are already present
in the cluster.
+      // Need to do below check from App.Service model as it keeps getting polled and updated
on service page.
+      return  !App.Service.find().findProperty('serviceName', serviceNameForcomponent).get('hostComponents').
+               filterProperty('componentName',_componentToAdd.componentName).someProperty('hostName',
_componentToAdd.hostName);
     }, this);
   },
 


Mime
View raw message