ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-11797. Atlas quick link URI is pointing to wrong path (Jon Maron via smohanty)
Date Mon, 08 Jun 2015 23:45:07 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e90bb8f91 -> 3447a4780


AMBARI-11797. Atlas quick link URI is pointing to wrong path (Jon Maron via smohanty)


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

Branch: refs/heads/trunk
Commit: 3447a4780713c12a1aa231bab6df0f08aa7383ea
Parents: e90bb8f
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Mon Jun 8 16:44:13 2015 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Mon Jun 8 16:44:59 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/3447a478/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 76f385b..f4a86d4 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -328,9 +328,9 @@ App.QuickLinks.FIXTURES = [
   {
     id:36,
     label:'Atlas Dashboard',
-    url:'%@://%@:%@/',
+    url:'%@://%@:%@/dashboard/index.html?user.name=%@',
     service_id: 'ATLAS',
-    template:'%@://%@:%@/',
+    template:'%@://%@:%@/dashboard/index.html?user.name=%@',
     http_config: 'metadata_port',
     https_config: 'metadata_port',
     site: 'metadata-env',

http://git-wip-us.apache.org/repos/asf/ambari/blob/3447a478/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 ff285a5..41b9483 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,7 @@ 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);
-          if (['FALCON', 'OOZIE'].contains(item.get('service_id'))) {
+          if (['FALCON', 'OOZIE', 'ATLAS'].contains(item.get('service_id'))) {
             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));


Mime
View raw message