diff --git a/workflow/engine/js/strategicDashboard/viewDashboardModel.js b/workflow/engine/js/strategicDashboard/viewDashboardModel.js index 56e3b3840..6a96e1c3f 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardModel.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardModel.js @@ -1,8 +1,8 @@ var ViewDashboardModel = function (oauthToken, server, workspace) { 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 = "/api/1.0/" + workspace + "/"; + //this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/"; this.oauthToken = oauthToken; this.helper = new ViewDashboardHelper(); this.cache = []; diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js index 18da14656..0e3f7ec10 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -432,6 +432,7 @@ var selectDefaultMonthAndYear = function () { } var initialDraw = function () { + selectDefaultMonthAndYear(); presenter.getUserDashboards(pageUserId) .then(function(dashboardsVM) { fillDashboardsList(dashboardsVM); @@ -439,7 +440,6 @@ var initialDraw = function () { /**** window initialization with favorite dashboard*****/ presenter.getDashboardIndicators(window.currentDashboardId, defaultInitDate(), defaultEndDate()) .done(function(indicatorsVM) { - selectDefaultMonthAndYear(); fillIndicatorWidgets(indicatorsVM); loadIndicator(getFavoriteIndicator().id, defaultInitDate(), defaultEndDate()); }); diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html index 71b126834..df8ce6b04 100644 --- a/workflow/engine/templates/strategicDashboard/viewDashboard.html +++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html @@ -82,7 +82,7 @@