ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-9989. Falcon Quick links in Ambari are broken (alexantonenko)
Date Mon, 09 Mar 2015 21:07:15 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bc7ff9ea5 -> cd155366b


AMBARI-9989. Falcon Quick links in Ambari are broken (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd155366
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd155366
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd155366

Branch: refs/heads/trunk
Commit: cd155366ba9ee2617cd3e2952f5ba7cda2b90ccf
Parents: bc7ff9e
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Mon Mar 9 22:00:26 2015 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Mon Mar 9 23:04:58 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/models/quick_links.js                | 4 ++--
 ambari-web/app/views/common/quick_view_link_view.js | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cd155366/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index 4d686d5..57f912a 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -286,9 +286,9 @@ App.QuickLinks.FIXTURES = [
   {
     id:32,
     label:'Falcon Web UI',
-    url:'%@://%@:%@/',
+    url:'%@://%@:%@/index.html?user.name=%@',
     service_id: 'FALCON',
-    template:'%@://%@:%@/',
+    template:'%@://%@:%@/index.html?user.name=%@',
     http_config: 'falcon_port',
     site: 'falcon-env',
     regex: '^(\\d+)$',

http://git-wip-us.apache.org/repos/asf/ambari/blob/cd155366/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 bd3f61e..f9ba942 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -137,7 +137,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);
-          item.set('url', item.get('template').fmt(protocol, hosts[0], port));
+          if (item.get('service_id') == 'FALCON') {
+            item.set('url', item.get('template').fmt(protocol, hosts[0], port, App.router.get('loginName')));
+          } else {
+            item.set('url', item.get('template').fmt(protocol, hosts[0], port));
+          }
         }
         return item;
       });


Mime
View raw message