You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/06/22 20:12:16 UTC
ambari git commit: AMBARI-12076 Unable to add custom Properties.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 9dc6858c0 -> f36ff36d0
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/f36ff36d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f36ff36d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f36ff36d
Branch: refs/heads/trunk
Commit: f36ff36d030cda174c39d7b70cb1758da50af3f0
Parents: 9dc6858
Author: aBabiichuk <ab...@hortonworks.com>
Authored: Mon Jun 22 21:04:22 2015 +0300
Committer: aBabiichuk <ab...@hortonworks.com>
Committed: Mon Jun 22 21:11:47 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/f36ff36d/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 41e59fd..7e00810 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/f36ff36d/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'
+ }
+ ]
})
});