Repository: ambari Updated Branches: refs/heads/trunk 87876375e -> d9b3d288e
AMBARI-19400 Reconfigure after adding/deleting ZooKeeper Server is not performed if Atlas is installed. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9b3d288 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9b3d288 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9b3d288 Branch: refs/heads/trunk Commit: d9b3d288e587eda1a2c8c180ca17c85878503fe1 Parents: 8787637 Author: ababiichuk <[email protected]> Authored: Fri Jan 6 12:48:23 2017 +0200 Committer: ababiichuk <[email protected]> Committed: Fri Jan 6 12:49:32 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/details.js | 4 +++- ambari-web/test/controllers/main/host/details_test.js | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d9b3d288/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index 7df2c4e..e2a2d8e 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -1496,7 +1496,9 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow this.get('zooKeeperRelatedServices').forEach(function (service) { if (services.someProperty('serviceName', service.serviceName)) { service.typesToLoad.forEach(function (type) { - urlParams.push('(type=' + type + '&tag=' + data.Clusters.desired_configs[type].tag + ')'); + if (data.Clusters.desired_configs[type]) { + urlParams.push('(type=' + type + '&tag=' + data.Clusters.desired_configs[type].tag + ')'); + } }); } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/d9b3d288/ambari-web/test/controllers/main/host/details_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js index 03dadc6..f047f15 100644 --- a/ambari-web/test/controllers/main/host/details_test.js +++ b/ambari-web/test/controllers/main/host/details_test.js @@ -877,6 +877,9 @@ describe('App.MainHostDetailsController', function () { }, 'accumulo-site': { tag: 1 + }, + 'application-properties': { + tag: 1 } } } @@ -928,6 +931,11 @@ describe('App.MainHostDetailsController', function () { loadService('ACCUMULO'); expect(controller.constructConfigUrlParams(data)).to.eql(['(type=accumulo-site&tag=1)']); }); + + it('ATLAS is installed, AMBARI_INFRA isn\'t installed', function () { + loadService('ATLAS'); + expect(controller.constructConfigUrlParams(data)).to.eql(['(type=application-properties&tag=1)']); + }); }); describe('#loadConfigsSuccessCallback()', function () { @@ -1017,7 +1025,7 @@ describe('App.MainHostDetailsController', function () { ]; }); - controller.saveZkConfigs(data, null, {}); + controller.saveZkConfigs(data); this.groups = controller.saveConfigsBatch.args[0][0]; }); afterEach(function () {
