Repository: ambari Updated Branches: refs/heads/trunk 2ff12b7e0 -> f6cd388f2
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/f6cd388f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6cd388f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f6cd388f Branch: refs/heads/trunk Commit: f6cd388f221132828302269b50159c9d8475f1ed Parents: 2ff12b7 Author: Jaimin Jetly <[email protected]> Authored: Wed Jun 1 15:37:51 2016 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Wed Jun 1 15:49:05 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/f6cd388f/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/f6cd388f/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/f6cd388f/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(); });
