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 2014/12/08 19:04:31 UTC
[2/3] ambari git commit: AMBARI-8584. "Remove host" action on
'Confirm Hosts' step after page refresh does not work (alexantonenko)
AMBARI-8584. "Remove host" action on 'Confirm Hosts' step after page refresh does not work (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5f2c1a21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5f2c1a21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5f2c1a21
Branch: refs/heads/trunk
Commit: 5f2c1a2178dc703c9a4a7de1883fcf2afb7fe8a1
Parents: 2e7b019
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Dec 8 18:40:00 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Dec 8 20:04:11 2014 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/installer.js | 2 +-
ambari-web/app/controllers/main/host/add_controller.js | 2 +-
ambari-web/test/controllers/main/host/add_controller_test.js | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5f2c1a21/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 73cfb62..8ae7225 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -113,7 +113,7 @@ App.InstallerController = App.WizardController.extend({
removeHosts: function (hosts) {
var dbHosts = this.getDBProperty('hosts');
hosts.forEach(function (_hostInfo) {
- var host = _hostInfo.hostName;
+ var host = _hostInfo.name;
delete dbHosts[host];
});
this.setDBProperty('hosts', dbHosts);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5f2c1a21/ambari-web/app/controllers/main/host/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/add_controller.js b/ambari-web/app/controllers/main/host/add_controller.js
index 9945aa3..aebb95e 100644
--- a/ambari-web/app/controllers/main/host/add_controller.js
+++ b/ambari-web/app/controllers/main/host/add_controller.js
@@ -85,7 +85,7 @@ App.AddHostController = App.WizardController.extend({
removeHosts: function (hosts) {
var dbHosts = this.getDBProperty('hosts');
hosts.forEach(function (_hostInfo) {
- var host = _hostInfo.hostName;
+ var host = _hostInfo.name;
delete dbHosts[host];
});
this.setDBProperty('hosts', dbHosts);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5f2c1a21/ambari-web/test/controllers/main/host/add_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/add_controller_test.js b/ambari-web/test/controllers/main/host/add_controller_test.js
index a16275e..09de2cf 100644
--- a/ambari-web/test/controllers/main/host/add_controller_test.js
+++ b/ambari-web/test/controllers/main/host/add_controller_test.js
@@ -51,7 +51,7 @@ describe('App.AddHostController', function () {
title: 'Host is passed, db is empty',
content: {
hosts: [
- {hostName: 'host1'}
+ {name: 'host1'}
],
dbHosts: {}
},
@@ -61,7 +61,7 @@ describe('App.AddHostController', function () {
title: 'Passed host different from hosts in db',
content: {
hosts: [
- {hostName: 'host1'}
+ {name: 'host1'}
],
dbHosts: {
'host2': {}
@@ -75,7 +75,7 @@ describe('App.AddHostController', function () {
title: 'Passed host match host in db',
content: {
hosts: [
- {hostName: 'host1'}
+ {name: 'host1'}
],
dbHosts: {
'host1': {}