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/08/05 14:53:01 UTC
ambari git commit: AMBARI-12646 Add service sets ranger
'admin_password' property value to ''. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 ab256f37a -> 4fbdc2b7c
AMBARI-12646 Add service sets ranger 'admin_password' property value to ''. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4fbdc2b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4fbdc2b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4fbdc2b7
Branch: refs/heads/branch-2.1
Commit: 4fbdc2b7c3a75256e2e516a58c1835d0f08e1a82
Parents: ab256f3
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Aug 5 15:49:57 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Aug 5 15:49:57 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 8 ++++++--
ambari-web/test/controllers/wizard_test.js | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fbdc2b7/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 0cc8e74..cd37894 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -45,7 +45,10 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
'serviceComponents'
],
- sensibleConfigs: ['admin_principal', 'admin_password'],
+ sensibleConfigs: [
+ { name: 'admin_principal', filename: 'krb5-conf.xml'},
+ { name: 'admin_password', filename: 'krb5-conf.xml' }
+ ],
init: function () {
this.clusters = App.Cluster.find();
@@ -884,7 +887,8 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
},
isExcludedConfig: function (configProperty) {
- return this.get('sensibleConfigs').indexOf(configProperty.name) > -1;
+ return this.get('sensibleConfigs').mapProperty('name').indexOf(configProperty.name) > -1
+ && this.get('sensibleConfigs').mapProperty('filename').indexOf(configProperty.filename) > -1;
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fbdc2b7/ambari-web/test/controllers/wizard_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard_test.js b/ambari-web/test/controllers/wizard_test.js
index c1ec31e..9f38134 100644
--- a/ambari-web/test/controllers/wizard_test.js
+++ b/ambari-web/test/controllers/wizard_test.js
@@ -941,7 +941,7 @@ describe('App.WizardController', function () {
isFinal: true,
defaultIsFinal: true,
supportsFinal: true,
- filename: 'filename',
+ filename: 'krb5-conf.xml',
displayType: 'string',
isRequiredByAgent: true,
hasInitialValue: true,
@@ -964,7 +964,7 @@ describe('App.WizardController', function () {
isFinal: true,
defaultIsFinal: true,
supportsFinal: true,
- filename: 'filename',
+ filename: 'krb5-conf.xml',
displayType: 'string',
isRequiredByAgent: true,
hasInitialValue: true,