ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject git commit: AMBARI-4152. Service Config page shows a blank page after enabling security (JS error). (onechiporenko)
Date Mon, 23 Dec 2013 12:20:45 GMT
Updated Branches:
  refs/heads/branch-1.4.3 1ad3114be -> ac4223e4d


AMBARI-4152. Service Config page shows a blank page after enabling security (JS error). (onechiporenko)


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

Branch: refs/heads/branch-1.4.3
Commit: ac4223e4dab038cb16ba2f23578f05fccef0b473
Parents: 1ad3114
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Mon Dec 23 14:18:55 2013 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Mon Dec 23 14:18:55 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/utils/config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ac4223e4/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 379b467..10ffd82 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -254,10 +254,10 @@ App.config = Em.Object.create({
           this.setServiceConfigUiAttributes(serviceConfigObj, configsPropertyDef);
         }
         if (_tag.siteName === 'global') {
-          if (configsPropertyDef.isRequiredByAgent === false) {
-            continue;
-          }
           if (configsPropertyDef) {
+            if (configsPropertyDef.isRequiredByAgent === false) {
+              continue;
+            }
             this.handleSpecialProperties(serviceConfigObj);
           } else {
             serviceConfigObj.isVisible = false;  // if the global property is not defined
on ui metadata global_properties.js then it shouldn't be a part of errorCount


Mime
View raw message