Repository: ambari Updated Branches: refs/heads/trunk 790c211d6 -> 54fd07325
AMBARI-11055. Going to an ambari-view from UI always hits a 302 redirect before view shows up (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54fd0732 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54fd0732 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54fd0732 Branch: refs/heads/trunk Commit: 54fd07325399f9ce57af05a27b783c28e759cd39 Parents: 790c211 Author: Srimanth Gunturi <[email protected]> Authored: Mon May 11 15:37:23 2015 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Mon May 11 15:42:49 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/main/views_controller.js | 2 +- ambari-web/app/routes/views.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/54fd0732/ambari-web/app/controllers/main/views_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/views_controller.js b/ambari-web/app/controllers/main/views_controller.js index 17d2a2a..06407c2 100644 --- a/ambari-web/app/controllers/main/views_controller.js +++ b/ambari-web/app/controllers/main/views_controller.js @@ -87,7 +87,7 @@ App.MainViewsController = Em.Controller.extend({ description: instance.ViewInstanceInfo.description || Em.I18n.t('views.main.instance.noDescription'), viewName: instance.ViewInstanceInfo.view_name, instanceName: instance.ViewInstanceInfo.instance_name, - href: instance.ViewInstanceInfo.context_path + href: instance.ViewInstanceInfo.context_path + "/" }); if( current_instance.visible ){ instances.push(current_instance); http://git-wip-us.apache.org/repos/asf/ambari/blob/54fd0732/ambari-web/app/routes/views.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/views.js b/ambari-web/app/routes/views.js index f77d516..7b504e4 100644 --- a/ambari-web/app/routes/views.js +++ b/ambari-web/app/routes/views.js @@ -36,7 +36,7 @@ module.exports = Em.Route.extend({ connectOutlets: function (router, params) { // find and set content for `mainViewsDetails` and associated controller - var href = ['/views', params.viewName, params.version, params.instanceName].join('/'); + var href = ['/views', params.viewName, params.version, params.instanceName + "/"].join('/'); var viewPath = this.parseViewPath(window.location.href.slice(window.location.href.indexOf('?'))); if (viewPath) { href = ['/views', params.viewName, params.version, params.instanceName.slice(0, params.instanceName.lastIndexOf('?'))].join('/');
