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/09/30 16:46:01 UTC
[41/50] [abbrv] ambari git commit: AMBARI-13264. Sometimes properties
are missing on config tab while adding Ranger (rzang)
AMBARI-13264. Sometimes properties are missing on config tab while adding Ranger (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/02c74c87
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/02c74c87
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/02c74c87
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 02c74c87ff35a1570369d0ee8b4acaeae2934cbe
Parents: 61540bb
Author: Richard Zang <rz...@apache.org>
Authored: Mon Sep 28 21:49:35 2015 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Mon Sep 28 21:50:51 2015 -0700
----------------------------------------------------------------------
ambari-web/app/views/common/controls_view.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/02c74c87/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index 523026c..17fab9f 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -447,10 +447,16 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
minorVersion = version? version[2]: 0;
// functionality added in HDP 2.3
// remove DB_FLAVOR so it can handle DB Connection checks
- if (App.get('currentStackName') == 'HDP' && majorVersion >= 2 && minorVersion>= 3) {
- return ['ranger.authentication.method'];
+ // PHD-2.3 and SAPHD-1.0 is based on HDP-2.3
+ var supportFromMap = {
+ 'HDP': 2.3,
+ 'PHD': 3.3,
+ 'SAPHD': 1.0
+ };
+ if (Number(majorVersion + '.' + minorVersion) < supportFromMap[App.get('currentStackName')]){
+ return ['DB_FLAVOR', 'authentication_method'];
}
- return ['DB_FLAVOR', 'authentication_method'];
+ return ['ranger.authentication.method'];
}.property('App.currentStackName'),
serviceConfig: null,