Repository: ambari Updated Branches: refs/heads/trunk 1cba6f459 -> 6e8ff42e8
AMBARI-17736. llap_queue_capacity appears when disabled Interactive Query (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e8ff42e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e8ff42e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e8ff42e Branch: refs/heads/trunk Commit: 6e8ff42e8980420b6792e6fb00f3eb058d1d396c Parents: 1cba6f4 Author: Alex Antonenko <[email protected]> Authored: Fri Jul 15 16:53:21 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Fri Jul 15 20:16:07 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/mixins/common/configs/configs_loader.js | 1 + ambari-web/test/controllers/main/service/info/config_test.js | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8ff42e/ambari-web/app/mixins/common/configs/configs_loader.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/configs_loader.js b/ambari-web/app/mixins/common/configs/configs_loader.js index a4542b0..115a3e0 100644 --- a/ambari-web/app/mixins/common/configs/configs_loader.js +++ b/ambari-web/app/mixins/common/configs/configs_loader.js @@ -140,6 +140,7 @@ App.ConfigsLoader = Em.Mixin.create(App.GroupsMappingMixin, { this.set('isCompareMode', false); this.set('versionLoaded', false); version = version || this.get('currentDefaultVersion'); + this.clearRecommendationsInfo(); if (version === this.get('currentDefaultVersion') && (!switchToGroup || switchToGroup.get('isDefault'))) { this.set('selectedVersion', this.get('currentDefaultVersion')); this.loadCurrentVersions(); http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8ff42e/ambari-web/test/controllers/main/service/info/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js index 2db8e0b..0aeb479 100644 --- a/ambari-web/test/controllers/main/service/info/config_test.js +++ b/ambari-web/test/controllers/main/service/info/config_test.js @@ -446,10 +446,12 @@ describe("App.MainServiceInfoConfigsController", function () { describe("#doCancel", function () { beforeEach(function () { sinon.stub(Em.run, 'once', Em.K); + sinon.stub(mainServiceInfoConfigsController, 'loadSelectedVersion'); sinon.stub(mainServiceInfoConfigsController, 'clearRecommendationsInfo'); }); afterEach(function () { Em.run.once.restore(); + mainServiceInfoConfigsController.loadSelectedVersion.restore(); mainServiceInfoConfigsController.clearRecommendationsInfo.restore(); });
