ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-12076 Unable to add custom Properties. (ababiichuk)
Date Mon, 22 Jun 2015 18:13:55 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 0263f005f -> 64beaa345


AMBARI-12076 Unable to add custom Properties. (ababiichuk)


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

Branch: refs/heads/branch-2.1
Commit: 64beaa3450c906302098649f17c24141d5caa25a
Parents: 0263f00
Author: aBabiichuk <ababiichuk@hortonworks.com>
Authored: Mon Jun 22 21:04:22 2015 +0300
Committer: aBabiichuk <ababiichuk@hortonworks.com>
Committed: Mon Jun 22 21:13:10 2015 +0300

----------------------------------------------------------------------
 .../configs/service_configs_by_category_view.js |  2 +-
 .../service_configs_by_category_view_test.js    | 32 +++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/64beaa34/ambari-web/app/views/common/configs/service_configs_by_category_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index 47722e1..7d3c304 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -343,7 +343,7 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
   },
 
   isSecureConfig: function (configName, filename) {
-    var secureConfigs = this.get('controller.secureConfigs').filterProperty('filename', filename);
+    var secureConfigs = App.config.get('secureConfigs').filterProperty('filename', filename);
     return !!secureConfigs.findProperty('name', configName);
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/64beaa34/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index 618ec7b..c7d6da9 100644
--- a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++ b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -217,23 +217,21 @@ describe('App.ServiceConfigsByCategoryView', function () {
     ];
 
     before(function () {
-      view.reopen({
-        controller: {
-          secureConfigs: [
-            {
-              name: 'n0',
-              filename: 'f0'
-            },
-            {
-              name: 'n1',
-              filename: 'f0'
-            },
-            {
-              name: 'n2',
-              filename: 'f1'
-            }
-          ]
-        }
+      App.config.reopen({
+        secureConfigs: [
+          {
+            name: 'n0',
+            filename: 'f0'
+          },
+          {
+            name: 'n1',
+            filename: 'f0'
+          },
+          {
+            name: 'n2',
+            filename: 'f1'
+          }
+        ]
       })
     });
 


Mime
View raw message