ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [13/50] ambari git commit: AMBARI-20373. Complete button after move masters is grayed out even after move has completed (akovalenko)
Date Fri, 10 Mar 2017 20:46:41 GMT
AMBARI-20373. Complete button after move masters is grayed out even after move has completed
(akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ca47478
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ca47478
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ca47478

Branch: refs/heads/branch-dev-logsearch
Commit: 0ca474786dcbdf8cf249f4b04c0ee106ee61cc9a
Parents: d3f7c8f
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Thu Mar 9 13:14:53 2017 +0200
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Thu Mar 9 16:26:17 2017 +0200

----------------------------------------------------------------------
 ambari-web/app/routes/reassign_master_routes.js | 33 ++++++++------------
 1 file changed, 13 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ca47478/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 798ec0f..341172b 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -293,22 +293,21 @@ module.exports = App.WizardRoute.extend({
 
     next: function (router) {
       var controller = router.get('reassignMasterController');
-      var reassignMasterWizardStep6 = router.get('reassignMasterWizardStep6Controller');
-      if (!reassignMasterWizardStep6.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.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() {
+          Em.run.next(function () {
             location.reload();
           });
-        }});
-      }
+        }
+      });
     },
 
     unroutePath: function () {
@@ -332,18 +331,12 @@ module.exports = App.WizardRoute.extend({
 
     next: function (router) {
       var controller = router.get('reassignMasterController');
-      var reassignMasterWizardStep7 = router.get('reassignMasterWizardStep7Controller');
-      if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-        controller.resetOnClose(controller, 'main.index');
-      }
+      controller.resetOnClose(controller, 'main.index');
     },
 
     complete: function (router) {
       var controller = router.get('reassignMasterController');
-      var reassignMasterWizardStep7 = router.get('reassignMasterWizardStep7Controller');
-      if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-        controller.resetOnClose(controller, 'main.index');
-      }
+      controller.resetOnClose(controller, 'main.index');
     },
 
     unroutePath: function () {


Mime
View raw message