Repository: ambari Updated Branches: refs/heads/trunk 282a59a7b -> d2265d00b
AMBARI-5718. View: Pig should not hardcode REST API with view name + instance name. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2265d00 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2265d00 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2265d00 Branch: refs/heads/trunk Commit: d2265d00b816aa2a2c2f81bbec055fa1762eed90 Parents: 282a59a Author: Jaimin Jetly <[email protected]> Authored: Fri May 9 15:03:23 2014 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Fri May 9 15:04:26 2014 -0700 ---------------------------------------------------------------------- .../src/main/resources/ui/pig-web/app/initialize.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d2265d00/contrib/views/pig/src/main/resources/ui/pig-web/app/initialize.js ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/initialize.js b/contrib/views/pig/src/main/resources/ui/pig-web/app/initialize.js index 0f2424b..c1938e5 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/initialize.js +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/initialize.js @@ -18,8 +18,21 @@ var App = require('app'); +function getNamespaceUrl() { + 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]; + version = ''; + } + var namespaceUrl = 'api/v1/views' + view + version + '/instances' + instance; + return namespaceUrl; +} + App.ApplicationAdapter = DS.RESTAdapter.extend({ - namespace:'api/v1/views/PIG/instances/PIG_1', + namespace: getNamespaceUrl(), headers: { 'X-Requested-By': 'ambari' }
