diff --git a/workflow/engine/js/strategicDashboard/timeSeriesModel.js b/workflow/engine/js/strategicDashboard/timeSeriesModel.js index ec9378423..6bc091ba9 100644 --- a/workflow/engine/js/strategicDashboard/timeSeriesModel.js +++ b/workflow/engine/js/strategicDashboard/timeSeriesModel.js @@ -1,7 +1,7 @@ var TimeSeriesModel = function (oauthToken, server, workspace, userId, strings) { this.server = server; this.workspace = workspace; - this.baseUrl = "/api/1.0/" + workspace + "/"; + this.baseUrl = server; this.oauthToken = oauthToken; this.helper = new ViewDashboardHelper(); this.cache = {}; diff --git a/workflow/engine/js/strategicDashboard/timeSeriesView.js b/workflow/engine/js/strategicDashboard/timeSeriesView.js index 0baa70415..92787a235 100644 --- a/workflow/engine/js/strategicDashboard/timeSeriesView.js +++ b/workflow/engine/js/strategicDashboard/timeSeriesView.js @@ -1,7 +1,6 @@ helper = new ViewDashboardHelper(); -var ws = urlProxy.split('/'); -tsModel = new TimeSeriesModel(token, urlProxy, ws[3], pageUserId, G_STRING); +tsModel = new TimeSeriesModel(token, urlProxy, workspace, pageUserId, G_STRING); tsPresenter = new TimeSeriesPresenter(tsModel); $(document).ready(function() { diff --git a/workflow/engine/js/strategicDashboard/viewDashboardModel.js b/workflow/engine/js/strategicDashboard/viewDashboardModel.js index 90f35173f..4626d0207 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardModel.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardModel.js @@ -1,8 +1,7 @@ var ViewDashboardModel = function (oauthToken, server, workspace, moneySymbol) { this.server = server; this.workspace = workspace; - this.baseUrl = "/api/1.0/" + workspace + "/"; - //this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/"; + this.baseUrl = server; this.oauthToken = oauthToken; this.helper = new ViewDashboardHelper(); this.moneySymbol = moneySymbol; diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js index 864dc0eea..80fe40471 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -230,8 +230,7 @@ WidgetBuilder.prototype.setColorForInefficiency = function ($widget, indicatorDa /**********************************************************************/ helper = new ViewDashboardHelper(); -var ws = urlProxy.split('/'); -model = new ViewDashboardModel(token, urlProxy, ws[3], moneyUnit); +model = new ViewDashboardModel(token, urlProxy, workspace, moneyUnit); presenter = new ViewDashboardPresenter(model); window.loadedIndicators = []; //updated in das-title-selector.click->fillIndicatorWidgets, ready->fillIndicatorWidgets