You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/04/11 13:24:34 UTC
git commit: AMBARI-5439. Add Service Wizard Step "assign slaves" is
broken. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 50ee0ff6a -> 8ded461a3
AMBARI-5439. Add Service Wizard Step "assign slaves" is broken. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ded461a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ded461a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ded461a
Branch: refs/heads/trunk
Commit: 8ded461a34f4f5207e16c9a31688c7cca0b6fb19
Parents: 50ee0ff
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Apr 11 14:21:39 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Apr 11 14:23:37 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ded461a/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index f39f024..61de2bd 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -41,7 +41,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
slaveComponents: function () {
return App.StackServiceComponent.find().filterProperty('isSlave',true);
- }.property(),
+ }.property('App.router.clusterController.isLoaded'),
allHosts: App.Host.find(),
@@ -813,9 +813,9 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
var uninstalledComponents = [];
components.forEach(function (component) {
- if (installedServices.contains(component.service_name)) {
- installedComponentsMap[component.component_name] = [];
- } else if (selectedServices.contains(component.service_name)) {
+ if (installedServices.contains(component.get('serviceName'))) {
+ installedComponentsMap[component.get('componentName')] = [];
+ } else if (selectedServices.contains(component.get('serviceName'))) {
uninstalledComponents.push(component);
}
}, this);
@@ -849,8 +849,8 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
var hosts = jQuery.extend(true, [], result.findProperty('componentName', 'DATANODE').hosts);
hosts.setEach('isInstalled', false);
result.push({
- componentName: component.component_name,
- displayName: App.format.role(component.component_name),
+ componentName: component.get('componentName'),
+ displayName: App.format.role(component.get('componentName')),
hosts: hosts,
isInstalled: false
})