Repository: ambari Updated Branches: refs/heads/branch-3.0-perf 72b784249 -> c7612bcf9
AMBARI-20641. Pig view fails to load when using ambari thru KNOX. (gauravn7) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b4e15b70 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b4e15b70 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b4e15b70 Branch: refs/heads/branch-3.0-perf Commit: b4e15b70c5b7b3144926c30ca1a396161f08aabd Parents: aba473e Author: Gaurav Nagar <[email protected]> Authored: Sat Apr 1 08:59:53 2017 +0530 Committer: Andrew Onishuk <[email protected]> Committed: Sat Apr 1 10:07:36 2017 +0300 ---------------------------------------------------------------------- .../pig/src/main/resources/ui/pig-web/app/app.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b4e15b70/contrib/views/pig/src/main/resources/ui/pig-web/app/app.js ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/app.js b/contrib/views/pig/src/main/resources/ui/pig-web/app/app.js index c683f72..35cce9d 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/app.js +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/app.js @@ -25,16 +25,19 @@ module.exports = Em.Application.create({ errorLog: "", getNamespaceUrl: function() { - var parts = window.location.pathname.match(/\/[^\/]*/g); - var view = parts[1]; - var version = '/versions' + parts[2]; - var instance = parts[3]; - if (parts.length == 4) { // version is not present - instance = parts[2]; + var parts = window.location.pathname.split('/').filter(function (i) { + return i !== ""; + }); + var view = parts[parts.length - 3]; + var version = '/versions/' + parts[parts.length - 2]; + var instance = parts[parts.length - 1]; + + if (!/^(\d+\.){2,3}\d+$/.test(parts[parts.length - 2])) { // version is not present + instance = parts[parts.length - 2]; version = ''; } - var namespaceUrl = 'api/v1/views' + view + version + '/instances' + instance; - return namespaceUrl; + var namespaceUrl = 'api/v1/views/' + view + version + '/instances/' + instance; + return namespaceUrl.replace(/^\/|\/$/g, ''); //remove starting slash if proxied through knox }, Resolver: Ember.DefaultResolver.extend({
