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 2016/06/01 22:37:43 UTC
ambari git commit: AMBARI-16993. Misc fixes related to slider while
enabling interactive query. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 c04b543b7 -> 26d00d980
AMBARI-16993. Misc fixes related to slider while enabling interactive query. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/26d00d98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/26d00d98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/26d00d98
Branch: refs/heads/branch-2.4
Commit: 26d00d9805aeb56b3c33cdd065b389eb76ed55a7
Parents: c04b543
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Jun 1 15:37:51 2016 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Jun 1 15:38:22 2016 -0700
----------------------------------------------------------------------
.../app/controllers/wizard/step7/assign_master_controller.js | 1 +
.../mixins/main/service/configs/component_actions_by_configs.js | 2 +-
.../controllers/wizard/step7/assign_master_controller_test.js | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/26d00d98/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index c0654a8..cf04bf2 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -158,6 +158,7 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin, App
var value = config.get('initialValue');
config.set('value', value);
configWidgetContext.setValue(value);
+ configWidgetContext.sendRequestRorDependentConfigs(config);
this._super();
},
secondary: null,
http://git-wip-us.apache.org/repos/asf/ambari/blob/26d00d98/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 0907aa7..d453ded 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -259,7 +259,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
return {
"type": 'PUT',
- "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') + "/host_components",
+ "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') + "/hosts/" + hostName + "/host_components",
"RequestBodyInfo": {
"RequestInfo": {
"context": context,
http://git-wip-us.apache.org/repos/asf/ambari/blob/26d00d98/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
index df2f70b..3ad3a95 100644
--- a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
+++ b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
@@ -148,13 +148,15 @@ describe('App.AssignMasterOnStep7Controller', function () {
displayName: 'c1'
}),
setValue: Em.K,
- toggleProperty: Em.K
+ toggleProperty: Em.K,
+ sendRequestRorDependentConfigs: Em.K
});
beforeEach(function() {
sinon.stub(stringUtils, 'getFormattedStringFromArray');
sinon.stub(mock, 'setValue');
sinon.stub(mock, 'toggleProperty');
+ sinon.stub(mock, 'sendRequestRorDependentConfigs');
sinon.spy(App.ModalPopup, 'show');
});
@@ -162,6 +164,7 @@ describe('App.AssignMasterOnStep7Controller', function () {
stringUtils.getFormattedStringFromArray.restore();
mock.setValue.restore();
mock.toggleProperty.restore();
+ mock.sendRequestRorDependentConfigs.restore();
App.ModalPopup.show.restore();
});