You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/11/19 19:27:49 UTC
ambari git commit: AMBARI-13892. SLAVE component with cardinality 0+
gets auto-selected during Add Service
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 71fa55fa5 -> 75e6e84cb
AMBARI-13892. SLAVE component with cardinality 0+ gets auto-selected during Add Service
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75e6e84c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75e6e84c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75e6e84c
Branch: refs/heads/branch-2.1
Commit: 75e6e84cb0f9c5ddd2bb3cb4ac64ccc02a0c0c74
Parents: 71fa55f
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Nov 19 20:19:06 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Nov 19 20:27:45 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/add_controller.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/75e6e84c/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index e7be889..1f3f5bc 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -409,7 +409,7 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
result.push({
componentName: component.get('componentName'),
displayName: App.format.role(component.get('componentName')),
- hosts: uninstalledComponentHosts,
+ hosts: component.get('minToInstall') != 0 ? uninstalledComponentHosts : [],
isInstalled: false
})
});
@@ -419,9 +419,8 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
/**
* Generate clients list for selected services and save it to model
- * @param stepController step4WizardController
*/
- saveClients: function (stepController) {
+ saveClients: function () {
var clients = [];
var serviceComponents = App.StackServiceComponent.find();
this.get('content.services').filterProperty('isSelected').filterProperty('isInstalled',false).forEach(function (_service) {