AMBARI-12603 serviceAccounts page doesn't show user properties. (ababiichuk)

ambari-web/app/controllers/global/cluster_controller.js

@@ -216,7 +216,9 @@ App.ClusterController = Em.Controller.extend({
       updater.updateServices(function () {
         self.updateLoadStatus('services');
         App.config.loadConfigsFromStack(App.Service.find().mapProperty('serviceName')).complete(function () {
-          self.set('isConfigsPropertiesLoaded', true);
+          App.config.loadClusterConfigsFromStack().complete(function() {
+            self.set('isConfigsPropertiesLoaded', true);
+          });
         });
         // service metrics loading doesn't affect overall progress
         updater.updateServiceMetric(function () {

ambari-web/app/controllers/main/admin/serviceAccounts_controller.js

@@ -56,8 +56,7 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
     this.setServiceConfigTags(loadedClusterSiteToTagMap);
     // load server stored configurations
     App.router.get('configurationController').getConfigsByTags(this.get('serviceConfigTags')).done(function (serverConfigs) {
-      var stackConfigs = App.StackConfigProperty.find().filterProperty('displayType', 'user');
-      self.createConfigObject(serverConfigs, stackConfigs);
+      self.createConfigObject(serverConfigs);
     });
   },
 
@@ -102,10 +101,9 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
    * Generate configuration object that will be rendered
    *
    * @param {Object[]} serverConfigs
-   * @param {Object[]} stackConfigs
    */
-  createConfigObject: function(serverConfigs, stackConfigs) {
-    var configs = App.config.mergePredefinedWithSaved(serverConfigs, stackConfigs, this.get('selectedService'));
+  createConfigObject: function(serverConfigs) {
+    var configs = App.config.mergePredefinedWithSaved(serverConfigs, this.get('selectedService'));
     var miscConfigs = configs.filterProperty('displayType', 'user').filterProperty('category', 'Users and Groups').filterProperty('isVisible', true);
 
     miscConfigs = App.config.miscConfigVisibleProperty(miscConfigs, App.Service.find().mapProperty('serviceName').concat('MISC'));

ambari-web/app/views/main/admin/serviceAccounts_view.js

@@ -21,6 +21,9 @@ var App = require('app');
 App.MainAdminServiceAccountsView = Em.View.extend({
   templateName: require('templates/main/admin/serviceAccounts'),
   didInsertElement: function() {
-    this.get('controller').loadUsers();
+    var self = this;
+    App.router.get('mainController').isLoading.call(App.router.get('clusterController'), 'isConfigsPropertiesLoaded').done(function () {
+      self.get('controller').loadUsers();
+    });
   }
 });