You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/09/17 17:29:21 UTC
ambari git commit: AMBARI-13131. Quick link for Ranger with HDP 2.2
does not track https port value (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e1bf82e57 -> 4f133eafe
AMBARI-13131. Quick link for Ranger with HDP 2.2 does not track https port value (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f133eaf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f133eaf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f133eaf
Branch: refs/heads/trunk
Commit: 4f133eafe31d006b3c66d78802e56390d3bf18ed
Parents: e1bf82e
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Sep 17 18:19:48 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Sep 17 18:29:14 2015 +0300
----------------------------------------------------------------------
.../app/views/common/quick_view_link_view.js | 6 +++---
.../test/views/common/quick_link_view_test.js | 18 ++++++++++++++++++
2 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f133eaf/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index 8fe5d0c..5421e67 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -455,16 +455,16 @@ App.QuickViewLinks = Em.View.extend({
*/
setPort: function (item, protocol, config) {
var configProperties = this.get('configProperties');
- var config = config || item.get('http_config');
+ var configProp = config || item.get('http_config');
var defaultPort = item.get('default_http_port');
if (protocol === 'https' && (config || item.get('https_config'))) {
- config = config || item.get('https_config');
+ configProp = config || item.get('https_config');
if (item.get('default_https_port')) {
defaultPort = item.get('default_https_port');
}
}
var site = configProperties.findProperty('type', item.get('site'));
- var propertyValue = site && site.properties && site.properties[config];
+ var propertyValue = site && site.properties && site.properties[configProp];
if (!propertyValue) {
if (item.get('service_id') == 'RANGER') {
// HDP 2.3
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f133eaf/ambari-web/test/views/common/quick_link_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/quick_link_view_test.js b/ambari-web/test/views/common/quick_link_view_test.js
index 92075e7..3d38836 100644
--- a/ambari-web/test/views/common/quick_link_view_test.js
+++ b/ambari-web/test/views/common/quick_link_view_test.js
@@ -118,6 +118,24 @@ describe('App.QuickViewLinks', function () {
}]
}),
Em.Object.create({
+ 'service_id': 'YARN',
+ 'protocol': 'https',
+ 'http_config': 'http_config',
+ 'https_config': 'https_config',
+ 'site': 'yarn-site',
+ 'result': '9090',
+ 'default_http_port': '8088',
+ 'default_https_port': '8090',
+ 'regex': '\\w*:(\\d+)',
+ 'configProperties': [{
+ 'type': 'yarn-site',
+ 'properties': {
+ 'http_config': 'h:9088',
+ 'https_config': 'h:9090'
+ }
+ }]
+ }),
+ Em.Object.create({
'service_id': 'RANGER',
'protocol': 'http',
'http_config': 'http_config',