You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/11/04 14:36:38 UTC
[11/50] [abbrv] ambari git commit: AMBARI-13675 Toggling and Saving
"Enable User Sync" on Ranger User Info page generates error count on Advanced
tab. (atkach)
AMBARI-13675 Toggling and Saving "Enable User Sync" on Ranger User Info page generates error count on Advanced tab. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f0cf13d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f0cf13d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f0cf13d
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0f0cf13d7d1931f3df4c80e9be172e73cd14a08e
Parents: 745036e
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Mon Nov 2 14:20:41 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Mon Nov 2 14:20:41 2015 +0200
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 3 ++-
ambari-web/test/utils/config_test.js | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f0cf13d/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index a9321be..61ad75f 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -337,7 +337,8 @@ App.config = Em.Object.create({
dependentConfigPattern: null,
options: null,
radioName: null,
- belongsToService: []
+ belongsToService: [],
+ widget: null
};
return Object.keys(coreObject|| {}).length ?
$.extend(tpl, coreObject) : tpl;
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f0cf13d/ambari-web/test/utils/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index af14cbf..8ea0d67 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -1005,7 +1005,8 @@ describe('App.config', function () {
dependentConfigPattern: null,
options: null,
radioName: null,
- belongsToService: []
+ belongsToService: [],
+ widget: null
};
it('create default config object', function () {
expect(App.config.createDefaultConfig('pName', 'pServiceName', 'pFileName', true)).to.eql(res);