You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/02/03 18:42:09 UTC

git commit: AmbariAMBARI-4510. Misc page not available in 2.1.1 stack. (onechiporenko)

Updated Branches:
  refs/heads/trunk a5c88d05a -> 337248d1d


AmbariAMBARI-4510. Misc page not available in 2.1.1 stack. (onechiporenko)


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

Branch: refs/heads/trunk
Commit: 337248d1dbd50a1062d4917b58458a4e55fd2bcf
Parents: a5c88d0
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Feb 3 19:39:17 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Feb 3 19:42:03 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/admin/misc_controller.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/337248d1/ambari-web/app/controllers/main/admin/misc_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/misc_controller.js b/ambari-web/app/controllers/main/admin/misc_controller.js
index 4587a94..787fc07 100644
--- a/ambari-web/app/controllers/main/admin/misc_controller.js
+++ b/ambari-web/app/controllers/main/admin/misc_controller.js
@@ -66,7 +66,14 @@ App.MainAdminMiscController = App.MainServiceInfoConfigsController.extend({
 
     if(sortOrder) {
       sortOrder.forEach(function(name) {
-        sorted.push(misc_configs.findProperty('name', name));
+        var user = misc_configs.findProperty('name', name);
+        if (user) {
+          sorted.push({
+            isVisible: user.get('isVisible'),
+            displayName: user.get('displayName'),
+            value: user.get('value')
+          });
+        }
       });
       this.set('users', sorted);
     }