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 2017/07/24 15:26:54 UTC
[28/50] [abbrv] ambari git commit: AMBARI-21515. Fix truststore
options values (akovalenko)
AMBARI-21515. Fix truststore options values (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba977e5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba977e5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba977e5a
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: ba977e5a95a0a579507259ba2ea114594c5345b8
Parents: 56f05f0
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jul 19 15:02:41 2017 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Jul 19 15:02:41 2017 +0300
----------------------------------------------------------------------
.../controllers/authentication/AuthenticationMainCtrl.js | 4 ++--
.../main/resources/ui/admin-web/app/scripts/i18n.config.js | 7 -------
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba977e5a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
index f9c9e61..bce9189 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
@@ -25,9 +25,9 @@ angular.module('ambariAdminConsole')
$scope.isLDAPEnabled = false;
$scope.connectivity = {
trustStore: 'default',
- trustStoreOptions: ['authentication.connectivity.trustStore.options.default', 'authentication.connectivity.trustStore.options.custom'],
+ trustStoreOptions: ['default', 'custom'],
trustStoreType: 'jks',
- trustStoreTypeOptions: ['authentication.connectivity.trustStoreType.options.jks', 'authentication.connectivity.trustStoreType.options.jceks', 'authentication.connectivity.trustStoreType.options.pkcs12']
+ trustStoreTypeOptions: ['jks', 'jceks', 'pkcs12']
};
$scope.attributes = {
detection: 'auto'
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba977e5a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 43b32da..dd930fa 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -434,17 +434,10 @@ angular.module('ambariAdminConsole')
'authentication.connectivity.trustStore.label': 'Trust Store',
- 'authentication.connectivity.trustStore.options.default': 'JDK Default',
- 'authentication.connectivity.trustStore.options.custom': 'Custom',
-
'authentication.connectivity.trustStorePath': 'Trust Store Path',
'authentication.connectivity.trustStoreType.label': 'Trust Store Type',
- 'authentication.connectivity.trustStoreType.options.jks': 'JKS',
- 'authentication.connectivity.trustStoreType.options.jceks': 'JCEKS',
- 'authentication.connectivity.trustStoreType.options.pkcs12': 'PKCS12',
-
'authentication.connectivity.trustStorePassword': 'Trust Store Password',
'authentication.connectivity.dn': 'Bind DN',
'authentication.connectivity.bindPassword': 'Bind Password',