You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/10/05 12:21:36 UTC
ambari git commit: Revert "AMBARI-13308. Config Versions list isn't
updated while user is on the configs page after adding/removing HiveServer2
(onechiporenko)"
Repository: ambari
Updated Branches:
refs/heads/trunk 920c29dd8 -> a845a44a2
Revert "AMBARI-13308. Config Versions list isn't updated while user is on the configs page after adding/removing HiveServer2 (onechiporenko)"
This reverts commit 920c29dd8d17f874448855398813e140863caf35.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a845a44a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a845a44a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a845a44a
Branch: refs/heads/trunk
Commit: a845a44a22c6a2ba6222a110359233f365feb51b
Parents: 920c29d
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Oct 5 13:21:07 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Oct 5 13:21:07 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/details.js | 5 ++---
ambari-web/test/controllers/main/host/details_test.js | 9 ---------
2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a845a44a/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 30304b2..507e375 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -433,7 +433,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
self.isServiceMetricsLoaded(function () {
self.loadConfigs();
});
- } else if (['HIVE_METASTORE', 'HIVE_SERVER'].contains(data.componentName)) {
+ } else if (data.componentName == 'HIVE_METASTORE') {
this.set('deleteHiveMetaStore', true);
this.loadConfigs('loadHiveConfigs');
} else if (data.componentName == 'NIMBUS') {
@@ -588,7 +588,6 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
}, Em.I18n.t('hosts.host.addComponent.' + componentName) + manualKerberosWarning);
break;
case 'HIVE_METASTORE':
- case 'HIVE_SERVER':
returnFunc = App.showConfirmationPopup(function () {
self.set('hiveMetastoreHost', hostName);
self.loadConfigs("loadHiveConfigs");
@@ -672,7 +671,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
* @param {object} data
* @param {object} opt
* @param {object} params
- * @method installNewComponentSuccessCallback
+ * @method installNewComponentSuccessCallbƒack
*/
installNewComponentSuccessCallback: function (data, opt, params) {
if (!data || !data.Requests || !data.Requests.id) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a845a44a/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 846b3ef..673eb8f 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -2399,15 +2399,6 @@ describe('App.MainHostDetailsController', function () {
expect(controller.get('deleteHiveMetaStore')).to.be.true;
expect(controller.loadConfigs.calledWith('loadHiveConfigs')).to.be.true;
});
- it('HIVE_SERVER component', function () {
- var data = {
- componentName: 'HIVE_SERVER'
- };
- controller._doDeleteHostComponentSuccessCallback({}, {}, data);
- expect(controller.get('_deletedHostComponentResult')).to.be.null;
- expect(controller.get('deleteHiveMetaStore')).to.be.true;
- expect(controller.loadConfigs.calledWith('loadHiveConfigs')).to.be.true;
- });
it('NIMBUS component', function () {
var data = {
componentName: 'NIMBUS'