Browse Source

Merge branch 'main' into module/timetracking

feature/brute_force_protection
Stephan Richter 3 months ago
parent
commit
ec247ca75c
  1. 1
      frontend/src/routes/task/ListTask.svelte
  2. 9
      legacy/src/main/java/de/srsoftware/umbrella/legacy/TaskLegacy.java

1
frontend/src/routes/task/ListTask.svelte

@ -147,6 +147,7 @@ @@ -147,6 +147,7 @@
{/if}
<button class="symbol" title={t('delete_task')} onclick={deleteTask} ></button>
<button class="symbol" title={t('add_subtask')} onclick={addSubtask}></button>
<a href="/time/add_task?tid={task.id}" class="symbol"></a>
{#if error}
<span class="error">{error}</span>
{/if}

9
legacy/src/main/java/de/srsoftware/umbrella/legacy/TaskLegacy.java

@ -4,6 +4,7 @@ package de.srsoftware.umbrella.legacy; @@ -4,6 +4,7 @@ package de.srsoftware.umbrella.legacy;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.umbrella.core.Constants.DESCRIPTION;
import static de.srsoftware.umbrella.core.Constants.TOKEN;
import static de.srsoftware.umbrella.core.Paths.JSON;
import static de.srsoftware.umbrella.core.Util.mapValues;
@ -18,6 +19,7 @@ import de.srsoftware.umbrella.core.ModuleRegistry; @@ -18,6 +19,7 @@ import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -51,6 +53,13 @@ public class TaskLegacy extends BaseHandler { @@ -51,6 +53,13 @@ public class TaskLegacy extends BaseHandler {
}
private boolean postJson(UmbrellaUser umbrellaUser, Map<String, Object> params, HttpExchange ex) throws IOException {
if (params.get("ids") instanceof String sid){
var taskId = Long.parseLong(sid);
var task = taskService().load(List.of(taskId)).values().stream().toList().getFirst();
var map = task.toMap();
map.put(DESCRIPTION,task.description());
return sendContent(ex,map);
}
if (params.get("ids") instanceof Map<?,?> taskIdMap){
var taskIds = taskIdMap.values().stream().map(Object::toString).map(Long::parseLong).toList();
return sendContent(ex,mapValues(taskService().load(taskIds)));

Loading…
Cancel
Save