Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0E07C200B40 for ; Thu, 2 Jun 2016 00:37:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0C795160A4D; Wed, 1 Jun 2016 22:37:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5454A160A4C for ; Thu, 2 Jun 2016 00:37:44 +0200 (CEST) Received: (qmail 4176 invoked by uid 500); 1 Jun 2016 22:37:43 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 4167 invoked by uid 99); 1 Jun 2016 22:37:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 22:37:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5692AE0498; Wed, 1 Jun 2016 22:37:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jaimin@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-16993. Misc fixes related to slider while enabling interactive query. (jaimin) Date: Wed, 1 Jun 2016 22:37:43 +0000 (UTC) archived-at: Wed, 01 Jun 2016 22:37:45 -0000 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 Authored: Wed Jun 1 15:37:51 2016 -0700 Committer: Jaimin Jetly 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(); });