ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-13264. Sometimes properties are missing on config tab while adding Ranger (rzang)
Date Tue, 29 Sep 2015 04:51:26 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 61540bbb5 -> 02c74c87f


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/trunk
Commit: 02c74c87ff35a1570369d0ee8b4acaeae2934cbe
Parents: 61540bb
Author: Richard Zang <rzang@apache.org>
Authored: Mon Sep 28 21:49:35 2015 -0700
Committer: Richard Zang <rzang@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,


Mime
View raw message