SORMAS-Foundation#2923 - do not navigate to case view if task was opened from task grid

Author: barnabartha

sormas-ui/src/main/java/de/symeda/sormas/ui/task/TaskController.java

@@ -99,7 +99,7 @@ public void onCommit() {
 		VaadinUiUtil.showModalPopupWindow(createView, I18nProperties.getString(Strings.headingCreateNewTask));
 	}
 
-	public void edit(TaskIndexDto dto, Runnable callback) {
+	public void edit(TaskIndexDto dto, Runnable callback, boolean fromCase) {
 
 		// get fresh data
 		TaskDto newDto = FacadeProvider.getTaskFacade().getByUuid(dto.getUuid());
@@ -119,7 +119,7 @@ public void onCommit() {
 					TaskDto dto = form.getValue();
 					FacadeProvider.getTaskFacade().saveTask(dto);
 
-					if (dto.getCaze() != null) {
+					if (fromCase && dto.getCaze() != null) {
 						ControllerProvider.getCaseController().navigateToCase(dto.getCaze().getUuid());
 					}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/task/TaskGrid.java

@@ -72,7 +72,7 @@ public TaskGrid(TaskCriteria criteria) {
 			setCriteria(criteria);
 		}
 
-		addEditColumn(e -> ControllerProvider.getTaskController().edit(e, this::reload));
+		addEditColumn(e -> ControllerProvider.getTaskController().edit(e, this::reload, false));
 
 		setStyleGenerator(item -> {
 			if (item != null && item.getTaskStatus() != null) {

sormas-ui/src/main/java/de/symeda/sormas/ui/task/TaskList.java

@@ -87,7 +87,7 @@ protected void drawDisplayedEntries() {
 			if (UserProvider.getCurrent().hasUserRight(UserRight.TASK_EDIT)) {
 				listEntry.addEditListener(
 					i,
-					(ClickListener) event -> ControllerProvider.getTaskController().edit(listEntry.getTask(), TaskList.this::reload));
+					(ClickListener) event -> ControllerProvider.getTaskController().edit(listEntry.getTask(), TaskList.this::reload, true));
 			}
 			listLayout.addComponent(listEntry);
 		}