You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/08/15 00:17:42 UTC
git commit: AMBARI-6862. Assign Slaves screen - step6 of installer is
blank when 2.1.GlusterFS stack is used. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 433337402 -> 58ae58d44
AMBARI-6862. Assign Slaves screen - step6 of installer is blank when 2.1.GlusterFS stack is used. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/58ae58d4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/58ae58d4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/58ae58d4
Branch: refs/heads/trunk
Commit: 58ae58d4447ca4de35d878817fb7066f60a46efe
Parents: 4333374
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Aug 14 15:17:20 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Aug 14 15:17:20 2014 -0700
----------------------------------------------------------------------
.../app/controllers/wizard/step6_controller.js | 25 ++++++--------------
1 file changed, 7 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/58ae58d4/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js
index 4f24b8b..882bf95 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -404,24 +404,13 @@ App.WizardStep6Controller = Em.Controller.extend({
* @param hostsObj
*/
selectClientHost: function (hostsObj) {
- var headers = this.get('headers');
- var clientHeaders = headers.findProperty('name', 'CLIENT');
- if (!clientHeaders) {
- return;
- }
- var client_is_set = false;
- hostsObj.forEach(function (host) {
- if (!client_is_set) {
- var checkboxes = host.get('checkboxes');
- var dfsService = App.StackService.find().findProperty('isPrimaryDFS');
- var checkboxServiceComponent = checkboxes.findProperty('title', headers.findProperty('name', dfsService.get('serviceComponents').
- findProperty('isShownOnInstallerSlaveClientPage').get('componentName')).get('label'));
- if (checkboxServiceComponent && checkboxServiceComponent.get('checked')) {
- checkboxes.findProperty('title', clientHeaders.get('label')).set('checked', true);
- client_is_set = true;
- }
- }
- }, this);
+ var nonMasterHost = hostsObj.findProperty('hasMaster',false);
+ if (nonMasterHost) {
+ var clientCheckBox = nonMasterHost.get('checkboxes').findProperty('name','CLIENT');
+ if (clientCheckBox) {
+ clientCheckBox.set('checked',true);
+ }
+ }
},
/**