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/08/15 15:51:28 UTC
git commit: AMBARI-6873. Incorrect behavior of "Configurations" page
in Add Host wizard (Max Shepel via alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk dd3a3853d -> c26968df4
AMBARI-6873. Incorrect behavior of "Configurations" page in Add Host wizard (Max Shepel via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c26968df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c26968df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c26968df
Branch: refs/heads/trunk
Commit: c26968df46b08c16f4c9fa129500ef92ec352b75
Parents: dd3a385
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Aug 15 16:45:42 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Aug 15 16:45:42 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/add_controller.js | 5 +++--
ambari-web/app/routes/add_host_routes.js | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c26968df/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 5705efb..fdcdbe3 100644
--- a/ambari-web/app/controllers/main/host/add_controller.js
+++ b/ambari-web/app/controllers/main/host/add_controller.js
@@ -254,12 +254,13 @@ App.AddHostController = App.WizardController.extend({
if (slave.hosts.length > 0) {
if (slave.componentName !== "CLIENT") {
var service = App.StackServiceComponent.find(slave.componentName).get('stackService');
- var configGroups = this.get('content.configGroups').filterProperty('ConfigGroup.tag', service);
+ var serviceName = service.get('serviceName');
+ var configGroups = this.get('content.configGroups').filterProperty('ConfigGroup.tag', serviceName);
var configGroupsNames = configGroups.mapProperty('ConfigGroup.group_name');
var defaultGroupName = service.get('displayName') + ' Default';
configGroupsNames.unshift(defaultGroupName);
selectedServices.push({
- serviceId: service.get('serviceName'),
+ serviceId: serviceName,
displayName: service.get('displayName'),
hosts: slave.hosts.mapProperty('hostName'),
configGroupsNames: configGroupsNames,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c26968df/ambari-web/app/routes/add_host_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js
index 10e30dd..2f4ab47 100644
--- a/ambari-web/app/routes/add_host_routes.js
+++ b/ambari-web/app/routes/add_host_routes.js
@@ -211,6 +211,7 @@ module.exports = App.WizardRoute.extend({
var addHostStep4Controller = router.get('addHostStep4Controller');
controller.setCurrentStep('4');
addHostStep4Controller.loadConfigGroups();
+ addHostStep4Controller.set('isConfigGroupLoaded', false);
addHostStep4Controller.configGroupsLoading().done(function () {
controller.dataLoading().done(function () {
controller.loadAllPriorSteps();