AMBARI-7139. kerberos security wizard: JS error thrown while deleting ATS host component. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24dea68d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24dea68d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24dea68d Branch: refs/heads/branch-alerts-dev Commit: 24dea68d6e6ec6825805b23abbc254bc61a6e351 Parents: 570de22 Author: Jaimin Jetly <jai...@hortonworks.com> Authored: Wed Sep 3 14:34:41 2014 -0700 Committer: Jaimin Jetly <jai...@hortonworks.com> Committed: Wed Sep 3 14:34:50 2014 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/main/admin/security/add/step4.js | 3 +++ .../main/admin/security/security_progress_controller.js | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/24dea68d/ambari-web/app/controllers/main/admin/security/add/step4.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/security/add/step4.js b/ambari-web/app/controllers/main/admin/security/add/step4.js index 939647d..da599a4 100644 --- a/ambari-web/app/controllers/main/admin/security/add/step4.js +++ b/ambari-web/app/controllers/main/admin/security/add/step4.js @@ -179,7 +179,10 @@ App.MainAdminSecurityAddStep4Controller = App.MainAdminSecurityProgressControlle * callback on failed deletion of component */ onDeleteError: function () { + var deleteAtsCommand = this.get('commands').findProperty('name', 'DELETE_ATS'); console.warn('Error: Can\'t delete APP_TIMELINE_SERVER'); + deleteAtsCommand.set('isError', true); + deleteAtsCommand.set('isSuccess', false); }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/24dea68d/ambari-web/app/controllers/main/admin/security/security_progress_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/security/security_progress_controller.js b/ambari-web/app/controllers/main/admin/security/security_progress_controller.js index 4af298a..33c3208 100644 --- a/ambari-web/app/controllers/main/admin/security/security_progress_controller.js +++ b/ambari-web/app/controllers/main/admin/security/security_progress_controller.js @@ -171,7 +171,11 @@ App.MainAdminSecurityProgressController = Em.Controller.extend({ command.set('isSuccess', true); } else { var timeLineServer = App.HostComponent.find().findProperty('componentName', 'APP_TIMELINE_SERVER'); - this.deleteComponents('APP_TIMELINE_SERVER', timeLineServer.get('hostName')); + if (timeLineServer) { + this.deleteComponents('APP_TIMELINE_SERVER', timeLineServer.get('hostName')); + } else { + this.onDeleteComplete(); + } } } return true;
