You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2016/06/23 21:16:58 UTC
ambari git commit: AMBARI-17407 Wizard in progress for other users
after Move Wizard (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 628f81922 -> ffdc50da1
AMBARI-17407 Wizard in progress for other users after Move Wizard (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ffdc50da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ffdc50da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ffdc50da
Branch: refs/heads/trunk
Commit: ffdc50da17c8290a1ac00e4106b02d4cf3cbeef8
Parents: 628f819
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Jun 23 22:29:54 2016 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Jun 23 22:38:07 2016 +0300
----------------------------------------------------------------------
ambari-web/app/routes/reassign_master_routes.js | 34 +++-----------------
1 file changed, 4 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ffdc50da/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 f079432..35bd96f 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -57,8 +57,8 @@ module.exports = App.WizardRoute.extend({
var step4Controller = router.get('reassignMasterWizardStep4Controller');
var testDBTaskId = step4Controller.get('tasks').filterProperty('command', 'testDBConnection').get('firstObject.id');
- if(currStep !== "7"
- && testDBTaskId
+ if(currStep !== "7"
+ && testDBTaskId
&& reassignMasterController.get('content.tasksStatuses').get(testDBTaskId) === "FAILED")
{
App.showConfirmationPopup(function () {
@@ -224,19 +224,7 @@ module.exports = App.WizardRoute.extend({
var controller = router.get('reassignMasterController');
var reassignMasterWizardStep4 = router.get('reassignMasterWizardStep4Controller');
if (!reassignMasterWizardStep4.get('isSubmitDisabled')) {
- controller.finish();
- controller.get('popup').hide();
- App.clusterStatus.setClusterStatus({
- clusterName: router.get('reassignMasterController.content.cluster.name'),
- clusterState: 'DEFAULT',
- localdb: App.db.data
- }, {alwaysCallback: function () {
- controller.get('popup').hide();
- router.transitionTo('main.index');
- Em.run.next(function() {
- location.reload();
- });
- }});
+ controller.resetOnClose(controller, 'main.index');
}
},
@@ -328,21 +316,7 @@ module.exports = App.WizardRoute.extend({
var controller = router.get('reassignMasterController');
var reassignMasterWizardStep7 = router.get('reassignMasterWizardStep7Controller');
if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
- controller.finish();
- controller.get('popup').hide();
- App.clusterStatus.setClusterStatus({
- clusterName: router.get('reassignMasterController.content.cluster.name'),
- clusterState: 'DEFAULT',
- localdb: App.db.data
- }, {
- alwaysCallback: function () {
- controller.get('popup').hide();
- router.transitionTo('main.index');
- Em.run.next(function() {
- location.reload();
- });
- }
- });
+ controller.resetOnClose(controller, 'main.index');
}
},