Updated Branches: refs/heads/trunk 5f9b4e834 -> 2a85a64b5
AMBARI-3205. NameNode HA wizard (rollback): Page refreshes need to be handled in Rollback popup Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2a85a64b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2a85a64b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2a85a64b Branch: refs/heads/trunk Commit: 2a85a64b5838e86a0890f4dc244ef81ed7476698 Parents: 5f9b4e8 Author: Alex Antonenko <[email protected]> Authored: Thu Sep 12 18:57:45 2013 +0300 Committer: Alex Antonenko <[email protected]> Committed: Thu Sep 12 18:57:45 2013 +0300 ---------------------------------------------------------------------- .../main/admin/highAvailability/rollback_controller.js | 3 +++ ambari-web/app/routes/main.js | 5 +++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2a85a64b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js index 144b38f..d1a6547 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js @@ -89,6 +89,9 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl newCommands = this.get('commands').splice(index); this.set('commands', newCommands); newTasks = tmpTasks.splice(index); + for (var i = 0; i < newTasks.length; i++) { + newTasks[i].id = i; + }; this.set('tasks', newTasks); }, http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2a85a64b/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 4384578..f299552 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -675,6 +675,9 @@ module.exports = Em.Route.extend({ highAvailabilityWizardController.finish(); highAvailabilityWizardController.get('popup').hide(); } + highAvailabilityRollbackController = router.get('highAvailabilityRollbackController') + highAvailabilityRollbackController.loadTasksStatuses(); + highAvailabilityRollbackController.loadRequestIds(); var popup = App.ModalPopup.show({ classNames: ['full-width-modal'], header: Em.I18n.t('admin.highAvailability.rollback.header'), @@ -694,6 +697,8 @@ module.exports = Em.Route.extend({ // } }, proceedOnClose: function () { + var controller = router.get('highAvailabilityWizardController'); + controller.clearStorageData(); App.router.get('updateController').set('isWorking', true); App.clusterStatus.setClusterStatus({ clusterName: router.get('content.cluster.name'),
