diff --git a/frontend/src/routes/project/Kanban.svelte b/frontend/src/routes/project/Kanban.svelte index 9b37d048..d739b839 100644 --- a/frontend/src/routes/project/Kanban.svelte +++ b/frontend/src/routes/project/Kanban.svelte @@ -190,7 +190,7 @@ const url = api('task/list'); selector.show_closed = true; selector.no_index = true; - selector.rendered = false; + selector.render = false; var resp = await post(url,selector); if (resp.ok){ var json = await resp.json(); diff --git a/frontend/src/routes/project/View.svelte b/frontend/src/routes/project/View.svelte index d3147cd4..b67830fc 100644 --- a/frontend/src/routes/project/View.svelte +++ b/frontend/src/routes/project/View.svelte @@ -108,7 +108,8 @@ const url = api('task/list'); const data = { project_id:+id, - show_closed:project.show_closed + show_closed:project.show_closed, + render: false } const resp = await fetch(url,{ credentials : 'include', 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 1680be5f..a793c49e 100644 --- a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java +++ b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java @@ -475,23 +475,23 @@ 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 markdown = !json.has(RENDERED) || !(json.get(RENDERED) instanceof Boolean render) || render; + 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); - return sendContent(ex, mapTasks(list,markdown)); + return sendContent(ex, mapTasks(list,render)); } var projectTasks = taskDb.listProjectTasks(projectId, parentTaskId, noIndex); loadMembers(projectTasks.values()); var tags = tagService().getTags(TASK,projectTasks.keySet(),user); projectTasks = addTags(projectTasks, tags); - return sendContent(ex, mapTasks(projectTasks, markdown)); + 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,markdown)); + if (isSet(taskIds)) return sendContent(ex, mapTasks(tasks,render)); return sendEmptyResponse(HTTP_NOT_IMPLEMENTED, ex); }