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/07/23 11:12:19 UTC
ambari git commit: AMBARI-12511. Oozie HA: Ambari quick link is not
correct. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 6728797f0 -> 47879c7ca
AMBARI-12511. Oozie HA: Ambari quick link is not correct. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47879c7c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47879c7c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47879c7c
Branch: refs/heads/trunk
Commit: 47879c7ca3e78617b156bc3c7608f3b6b3a5cabc
Parents: 6728797
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jul 23 12:08:04 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jul 23 12:11:36 2015 +0300
----------------------------------------------------------------------
.../app/views/common/quick_view_link_view.js | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/47879c7c/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 f383b35..fc3293a 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -157,7 +157,11 @@ App.QuickViewLinks = Em.View.extend({
var protocol = self.setProtocol(item.get('service_id'), self.get('configProperties'), self.ambariProperties());
if (item.get('template')) {
var port = item.get('http_config') && self.setPort(item, protocol);
- newItem.url = item.get('template').fmt(protocol, host.publicHostName, port);
+ if (item.get('service_id')==='OOZIE') {
+ newItem.url = item.get('template').fmt(protocol, host.publicHostName, port, App.router.get('loginName'));
+ } else {
+ newItem.url = item.get('template').fmt(protocol, host.publicHostName, port);
+ }
newItem.label = item.get('label');
}
quickLinks.push(newItem);
@@ -187,6 +191,20 @@ App.QuickViewLinks = Em.View.extend({
}
var hosts = [];
switch (serviceName) {
+ case 'OOZIE':
+ // active OOZIE components
+ var components = this.get('content.hostComponents').filterProperty('componentName','OOZIE_SERVER').filterProperty('workStatus', 'STARTED');
+ if (components && components.length > 1) {
+ components.forEach(function (component) {
+ hosts.push({
+ 'publicHostName': response.items.findProperty('Hosts.host_name', component.get('hostName')).Hosts.public_host_name,
+ 'status': Em.I18n.t('quick.links.label.active')
+ });
+ });
+ } else if (components && components.length === 1) {
+ hosts[0] = this.findComponentHost(response.items, 'OOZIE_SERVER');
+ }
+ break;
case "HDFS":
if (this.get('content.snameNode')) {
// not HA