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/01 17:30:36 UTC
ambari git commit: AMBARI-12920. “Oozie Quick links" in Ambari points to incorrect URL after enabling SSL. Additional fix (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 544824970 -> abb437c18
AMBARI-12920. “Oozie Quick links" in Ambari points to incorrect URL after enabling SSL. Additional fix (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/abb437c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/abb437c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/abb437c1
Branch: refs/heads/branch-2.1
Commit: abb437c184f377ab8b83518291fe6f7e33c67e25
Parents: 5448249
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Sep 1 18:24:27 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Sep 1 18:24:27 2015 +0300
----------------------------------------------------------------------
ambari-web/app/views/common/quick_view_link_view.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/abb437c1/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 9fa2044..522837e 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -382,16 +382,18 @@ App.QuickViewLinks = Em.View.extend({
break;
case "OOZIE":
var site = configProperties.findProperty('type', 'oozie-site');
- var url = site && site.properties && site.properties['oozie.base.url'];
+ var properties = site && site.properties;
+ var url = properties && properties['oozie.base.url'];
var re = new RegExp(item.get('regex'));
var portValue = url && url.match(re);
var port = portValue && portValue.length && portValue[1];
var protocol = 'http';
-
- if (port === '11443') {
+ var isHttpsPropertiesEnabled = properties && (properties['oozie.https.port'] ||
+ properties['oozie.https.keystore.file'] ||
+ properties['oozie.https.keystore.pass']);
+ if (port === '11443' || isHttpsPropertiesEnabled) {
protocol = 'https';
}
-
return protocol;
break;
case "RANGER":