From d2d534cb14c6a14e1639b90b78f9b9428e0ee500 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Thu, 8 Oct 2026 01:28:00 +0200 Subject: [PATCH] fixed code so it works for task list in project view Signed-off-by: Stephan Richter --- frontend/src/routes/project/View.svelte | 6 +----- frontend/src/routes/task/ListTask.svelte | 3 ++- .../de/srsoftware/umbrella/task/TaskModule.java | 14 ++++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/frontend/src/routes/project/View.svelte b/frontend/src/routes/project/View.svelte index b67830fc..5f7e5363 100644 --- a/frontend/src/routes/project/View.svelte +++ b/frontend/src/routes/project/View.svelte @@ -111,11 +111,7 @@ show_closed:project.show_closed, render: false } - const resp = await fetch(url,{ - credentials : 'include', - method : 'POST', - body : JSON.stringify(data) - }); + const resp = await post(url,data); if (resp.ok){ tasks = {}; est_time.sum = 0; diff --git a/frontend/src/routes/task/ListTask.svelte b/frontend/src/routes/task/ListTask.svelte index 424685bb..1fc1bf01 100644 --- a/frontend/src/routes/task/ListTask.svelte +++ b/frontend/src/routes/task/ListTask.svelte @@ -80,7 +80,8 @@ const url = api('task/list'); const data = { parent_task_id : +task.id, - show_closed : show_closed + show_closed : show_closed, + render : false }; if (task.show_closed) data.show_closed = true; const resp = await post(url,data); diff --git a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java index a793c49e..ad87152e 100644 --- a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java +++ b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java @@ -475,7 +475,7 @@ public class TaskModule extends BaseHandler implements TaskService { var noIndex = json.has(NO_INDEX) && json.get(NO_INDEX) instanceof Boolean bool ? bool : false; var projectId = json.has(PROJECT_ID) && json.get(PROJECT_ID) instanceof Number number ? number.longValue() : null; var parentTaskId = json.has(PARENT_TASK_ID) && json.get(PARENT_TASK_ID) instanceof Number number ? number.longValue() : null; - var render = !json.has(RENDER) || !(json.get(RENDER) instanceof Boolean bool) || bool; + var render = !json.has(RENDER) || !(json.get(RENDER) instanceof Boolean bool) || bool; if (isSet(projectId)) { if (parentTaskId == null) { var list = taskDb.listRootTasks(projectId, user, showClosed); @@ -488,11 +488,13 @@ public class TaskModule extends BaseHandler implements TaskService { projectTasks = addTags(projectTasks, tags); return sendContent(ex, mapTasks(projectTasks, render)); } - if (isSet(parentTaskId)) return sendContent(ex, mapValues(taskDb.listChildrenOf(parentTaskId, user, showClosed))); - var taskIds = json.has(IDS) && json.get(IDS) instanceof JSONArray ids ? ids.toList().stream().map(Object::toString).map(Long::parseLong).toList() : null; - var tasks = taskDb.load(taskIds); - if (isSet(taskIds)) return sendContent(ex, mapTasks(tasks,render)); - return sendEmptyResponse(HTTP_NOT_IMPLEMENTED, ex); + Map tasks; + if (!isSet(parentTaskId)) { + var taskIds = json.has(IDS) && json.get(IDS) instanceof JSONArray ids ? ids.toList().stream().map(Object::toString).map(Long::parseLong).toList() : null; + if (!isSet(taskIds)) return sendEmptyResponse(HTTP_NOT_IMPLEMENTED,ex); + tasks = taskDb.load(taskIds); + } else tasks = taskDb.listChildrenOf(parentTaskId,user,showClosed); + return sendContent(ex, mapTasks(tasks,render)); } private Map addTags(Map taskList, Map> tags) {