Repository: ambari Updated Branches: refs/heads/branch-2.1 886d0c441 -> e1862e9b5
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/e1862e9b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1862e9b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1862e9b Branch: refs/heads/branch-2.1 Commit: e1862e9b548d5f587396c024095ca812f7811020 Parents: 886d0c4 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Mon Jun 8 16:44:13 2015 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Mon Jun 8 16:44:13 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/e1862e9b/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/e1862e9b/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));