You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/02/06 20:04:50 UTC

ambari git commit: AMBARI-9522. NameNode HA step1 page refresh (alexantonenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk d7a538165 -> bca1c7b93


AMBARI-9522. NameNode HA step1 page refresh (alexantonenko)


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

Branch: refs/heads/trunk
Commit: bca1c7b9385ada52bc4325dc6693509805b589b2
Parents: d7a5381
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Feb 6 19:05:19 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Feb 6 21:04:45 2015 +0200

----------------------------------------------------------------------
 .../app/controllers/main/admin/serviceAccounts_controller.js   | 4 ++--
 ambari-web/app/routes/high_availability_routes.js              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bca1c7b9/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
index 204db2b..e4f1918 100644
--- a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
+++ b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
@@ -49,8 +49,8 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
     var serviceName = this.get('selectedService');
     var loadedClusterSiteToTagMap = {};
 
-    for (var site in data.Clusters.desired_configs) {
-      if (!!serviceConfigsDef.configTypes[site]) {
+    for (var site in Em.get(data, 'Clusters.desired_configs')) {
+      if (serviceConfigsDef.configTypes.hasOwnProperty(site)) {
         loadedClusterSiteToTagMap[site] = data.Clusters.desired_configs[site]['tag'];
       }
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/bca1c7b9/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 be8a575..d4ec3c3 100644
--- a/ambari-web/app/routes/high_availability_routes.js
+++ b/ambari-web/app/routes/high_availability_routes.js
@@ -100,10 +100,10 @@ module.exports = App.WizardRoute.extend({
     route: '/step1',
     connectOutlets: function (router) {
       var controller = router.get('highAvailabilityWizardController');
-      controller.usersLoading().done(function () {
-        controller.saveHdfsUser();
+      controller.dataLoading().done(function () {
         controller.setCurrentStep('1');
-        controller.dataLoading().done(function () {
+        controller.usersLoading().done(function () {
+          controller.saveHdfsUser();
           controller.loadAllPriorSteps();
           controller.connectOutlet('highAvailabilityWizardStep1', controller.get('content'));
         })