Repository: ambari Updated Branches: refs/heads/trunk 9404dee98 -> b019e1dcf
AMBARI-15649. Service Actions button is missing (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b019e1dc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b019e1dc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b019e1dc Branch: refs/heads/trunk Commit: b019e1dcf22b1c79c8fef0f63979b7289f0c66ce Parents: 9404dee Author: Alex Antonenko <hiv...@gmail.com> Authored: Thu Mar 31 17:37:28 2016 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Fri Apr 1 10:39:16 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/add_host_routes.js | 2 +- ambari-web/app/routes/add_kerberos_routes.js | 2 +- ambari-web/app/routes/add_service_routes.js | 2 +- ambari-web/app/routes/high_availability_routes.js | 2 +- ambari-web/app/routes/ra_high_availability_routes.js | 2 +- ambari-web/app/routes/reassign_master_routes.js | 2 +- ambari-web/app/routes/rm_high_availability_routes.js | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b019e1dc/ambari-web/app/routes/add_host_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js index 9e4e694..7c498a7 100644 --- a/ambari-web/app/routes/add_host_routes.js +++ b/ambari-web/app/routes/add_host_routes.js @@ -22,10 +22,10 @@ module.exports = App.WizardRoute.extend({ route: '/host/add', leaveWizard: function (router, context) { + App.router.get('wizardWatcherController').resetUser(); var addHostController = router.get('addHostController'); App.router.get('updateController').set('isWorking', true); addHostController.finish(); - App.router.get('wizardWatcherController').resetUser(); App.clusterStatus.setClusterStatus({ clusterName: App.router.get('content.cluster.name'), clusterState: 'DEFAULT', http://git-wip-us.apache.org/repos/asf/ambari/blob/b019e1dc/ambari-web/app/routes/add_kerberos_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js index 150fc42..8393f39 100644 --- a/ambari-web/app/routes/add_kerberos_routes.js +++ b/ambari-web/app/routes/add_kerberos_routes.js @@ -71,6 +71,7 @@ module.exports = App.WizardRoute.extend({ var kerberosProgressPageController = App.router.get('kerberosProgressPageController'); var controller = App.router.get('kerberosWizardController'); var exitPath = controller.getDBProperty('onClosePath') || 'adminKerberos.index'; + App.router.get('wizardWatcherController').resetUser(); controller.clearTasksData(); controller.finish(); App.get('router.updateController').set('isWorking', true); @@ -81,7 +82,6 @@ module.exports = App.WizardRoute.extend({ location.reload(); }); } - App.router.get('wizardWatcherController').resetUser(); App.clusterStatus.setClusterStatus({ clusterName: App.router.getClusterName(), clusterState: 'DEFAULT', http://git-wip-us.apache.org/repos/asf/ambari/blob/b019e1dc/ambari-web/app/routes/add_service_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js index d95943d..5458847 100644 --- a/ambari-web/app/routes/add_service_routes.js +++ b/ambari-web/app/routes/add_service_routes.js @@ -45,6 +45,7 @@ module.exports = App.WizardRoute.extend({ App.router.transitionTo('main.services.index'); }, onClose: function () { + App.router.get('wizardWatcherController').resetUser(); this.set('showCloseButton', false); // prevent user to click "Close" many times App.router.get('updateController').set('isWorking', true); var self = this; @@ -53,7 +54,6 @@ module.exports = App.WizardRoute.extend({ }); var exitPath = addServiceController.getDBProperty('onClosePath') || 'main.services.index'; addServiceController.finish(); - App.router.get('wizardWatcherController').resetUser(); // We need to do recovery based on whether we are in Add Host or Installer wizard App.clusterStatus.setClusterStatus({ clusterName: App.router.get('content.cluster.name'), http://git-wip-us.apache.org/repos/asf/ambari/blob/b019e1dc/ambari-web/app/routes/high_availability_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/high_availability_routes.js b/ambari-web/app/routes/high_availability_routes.js index 14fd872..9042dbd 100644 --- a/ambari-web/app/routes/high_availability_routes.js +++ b/ambari-web/app/routes/high_availability_routes.js @@ -52,6 +52,7 @@ module.exports = App.WizardRoute.extend({ }.observes('App.router.highAvailabilityWizardController.currentStep'), onClose: function () { + App.router.get('wizardWatcherController').resetUser(); var self = this; var currStep = App.router.get('highAvailabilityWizardController.currentStep'); var highAvailabilityProgressPageController = App.router.get('highAvailabilityProgressPageController'); @@ -68,7 +69,6 @@ module.exports = App.WizardRoute.extend({ controller.clearTasksData(); controller.finish(); App.router.get('updateController').set('isWorking', true); - App.router.get('wizardWatcherController').resetUser(); App.clusterStatus.setClusterStatus({ clusterName: controller.get('content.cluster.name'), clusterState: 'DEFAULT', http://git-wip-us.apache.org/repos/asf/ambari/blob/b019e1dc/ambari-web/app/routes/ra_high_availability_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/ra_high_availability_routes.js b/ambari-web/app/routes/ra_high_availability_routes.js index 5a1052e..54844c0 100644 --- a/ambari-web/app/routes/ra_high_availability_routes.js +++ b/ambari-web/app/routes/ra_high_availability_routes.js @@ -43,7 +43,7 @@ module.exports = App.WizardRoute.extend({ var rAHighAvailabilityWizardController = router.get('rAHighAvailabilityWizardController'), currStep = rAHighAvailabilityWizardController.get('currentStep'), self = this; - + App.router.get('wizardWatcherController').resetUser(); if (parseInt(currStep) === 4) { App.showConfirmationPopup(function () { router.get('updateController').set('isWorking', true); http://git-wip-us.apache.org/repos/asf/ambari/blob/b019e1dc/ambari-web/app/routes/reassign_master_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/reassign_master_routes.js b/ambari-web/app/routes/reassign_master_routes.js index c8cff6b..acc071d 100644 --- a/ambari-web/app/routes/reassign_master_routes.js +++ b/ambari-web/app/routes/reassign_master_routes.js @@ -22,10 +22,10 @@ module.exports = App.WizardRoute.extend({ route: '/service/reassign', leaveWizard: function (router, context) { + App.router.get('wizardWatcherController').resetUser(); var reassignMasterController = router.get('reassignMasterController'); App.router.get('updateController').set('isWorking', true); reassignMasterController.finish(); - App.router.get('wizardWatcherController').resetUser(); App.clusterStatus.setClusterStatus({ clusterName: App.router.get('content.cluster.name'), clusterState: 'DEFAULT', http://git-wip-us.apache.org/repos/asf/ambari/blob/b019e1dc/ambari-web/app/routes/rm_high_availability_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/rm_high_availability_routes.js b/ambari-web/app/routes/rm_high_availability_routes.js index a3b40bb..e6f091f 100644 --- a/ambari-web/app/routes/rm_high_availability_routes.js +++ b/ambari-web/app/routes/rm_high_availability_routes.js @@ -41,7 +41,7 @@ module.exports = App.WizardRoute.extend({ var rMHighAvailabilityWizardController = router.get('rMHighAvailabilityWizardController'), currStep = rMHighAvailabilityWizardController.get('currentStep'), self = this; - + App.router.get('wizardWatcherController').resetUser(); if (parseInt(currStep) === 4) { App.showConfirmationPopup(function () { router.get('updateController').set('isWorking', true); @@ -63,7 +63,6 @@ module.exports = App.WizardRoute.extend({ } else { router.get('updateController').set('isWorking', true); rMHighAvailabilityWizardController.finish(); - App.router.get('wizardWatcherController').resetUser(); App.clusterStatus.setClusterStatus({ clusterName: App.router.getClusterName(), clusterState: 'DEFAULT',
