bugfix cannot add a new KPI to dashboard

#462 see metasfresh/metasfresh-webui-frontend-legacy#905 (comment) (cherry picked from commit fc5edb3)
metasfresh · Jun 23, 2017 · 2231c59 · 2231c59
1 parent 59301ff
commit 2231c59
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/main/java/de/metas/ui/web/dashboard/DashboardRestController.java b/src/main/java/de/metas/ui/web/dashboard/DashboardRestController.java
@@ -112,10 +112,9 @@ public JSONDashboardItem addKPIItem(@RequestBody final JsonUserDashboardItemAddR
 	{
 		userSession.assertLoggedIn();
 
-		final UserDashboard userDashboard = getUserDashboardForWriting();
-		final int itemId = userDashboardRepo.addUserDashboardItem(userDashboard, DashboardWidgetType.KPI, request);
+		final int itemId = userDashboardRepo.addUserDashboardItem(getUserDashboardForWriting(), DashboardWidgetType.KPI, request);
 
-		final UserDashboardItem kpiItem = userDashboard.getItemById(DashboardWidgetType.KPI, itemId);
+		final UserDashboardItem kpiItem = getUserDashboardForReading().getItemById(DashboardWidgetType.KPI, itemId);
 		return JSONDashboardItem.of(kpiItem, newJSONOpts());
 	}
 
@@ -124,8 +123,7 @@ public void changeKPIsDashboard(@RequestBody final List<JSONPatchEvent<Dashboard
 	{
 		userSession.assertLoggedIn();
 
-		final UserDashboard dashboard = getUserDashboardForWriting();
-		userDashboardRepo.changeDashboardItems(dashboard, DashboardWidgetType.KPI, events);
+		userDashboardRepo.changeDashboardItems(getUserDashboardForWriting(), DashboardWidgetType.KPI, events);
 	}
 
 	private final KPIDataResult getKPIData(final UserDashboardItem dashboardItem, final long fromMillis, final long toMillis, final boolean prettyValues)
@@ -170,10 +168,9 @@ public JSONDashboardItem addTargetIndicatorItem(@RequestBody final JsonUserDashb
 	{
 		userSession.assertLoggedIn();
 
-		final UserDashboard dashboard = getUserDashboardForWriting();
-		final int itemId = userDashboardRepo.addUserDashboardItem(dashboard, DashboardWidgetType.TargetIndicator, request);
+		final int itemId = userDashboardRepo.addUserDashboardItem(getUserDashboardForWriting(), DashboardWidgetType.TargetIndicator, request);
 
-		final UserDashboardItem targetIndicatorItem = dashboard.getItemById(DashboardWidgetType.TargetIndicator, itemId);
+		final UserDashboardItem targetIndicatorItem = getUserDashboardForReading().getItemById(DashboardWidgetType.TargetIndicator, itemId);
 		return JSONDashboardItem.of(targetIndicatorItem, newJSONOpts());
 	}