ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-17091. Add spinner to Assign master view (onechiporenko)
Date Wed, 08 Jun 2016 08:11:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 8a38959c4 -> 298b7cf88


AMBARI-17091. Add spinner to Assign master view (onechiporenko)


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

Branch: refs/heads/branch-2.4
Commit: 298b7cf882b464a17c1af48af84d691f149221e0
Parents: 8a38959
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Tue Jun 7 15:48:16 2016 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Wed Jun 8 11:11:37 2016 +0300

----------------------------------------------------------------------
 .../app/controllers/wizard/step7/assign_master_controller.js    | 5 ++---
 ambari-web/app/mixins/wizard/assign_master_components.js        | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/298b7cf8/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index acbb198..3e93e3b 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -115,7 +115,7 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin,
App
       },
       showWarningPopup: function() {
         var mainPopupContext = this;
-        var warningPopup = App.ModalPopup.show({
+        App.ModalPopup.show({
           encodeBody: false,
           header: Em.I18n.t('common.warning'),
           primaryClass: 'btn-warning',
@@ -230,7 +230,6 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin,
App
 
       this.set("hosts", result);
       this.sortHosts(result);
-      this.set('isLoaded', true);
     }
   },
 
@@ -373,7 +372,7 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin,
App
    * @method submit
    */
   submit: function () {
-    var self  = this;
+    var self = this;
     App.get('router.mainAdminKerberosController').getKDCSessionState(function() {
       self.get('popup').hide();
       var context = self.get('configWidgetContext');

http://git-wip-us.apache.org/repos/asf/ambari/blob/298b7cf8/ambari-web/app/mixins/wizard/assign_master_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js
index a8b0caf..1ed649b 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -498,6 +498,7 @@ App.AssignMasterComponents = Em.Mixin.create({
   clearStep: function () {
     this.setProperties({
       hosts: [],
+      isLoaded: false,
       selectedServicesMasters: [],
       servicesMasters: []
     });
@@ -527,6 +528,7 @@ App.AssignMasterComponents = Em.Mixin.create({
     self.get('addableComponents').forEach(function (componentName) {
       self.updateComponent(componentName);
     }, self);
+    self.set('isLoaded', true);
     if (self.thereIsNoMasters() && !self.get('mastersToCreate').length) {
       App.router.send('next');
     }
@@ -597,7 +599,6 @@ App.AssignMasterComponents = Em.Mixin.create({
     }
     this.set("hosts", result);
     this.sortHosts(this.get('hosts'));
-    this.set('isLoaded', true);
   },
 
   /**


Mime
View raw message