diff --git a/frontend/src/Components/Footer.svelte b/frontend/src/Components/Footer.svelte
index 91b8b21..50db002 100644
--- a/frontend/src/Components/Footer.svelte
+++ b/frontend/src/Components/Footer.svelte
@@ -3,5 +3,5 @@
\ No newline at end of file
diff --git a/frontend/src/routes/project/Kanban.svelte b/frontend/src/routes/project/Kanban.svelte
index bffbefd..90e6cdf 100644
--- a/frontend/src/routes/project/Kanban.svelte
+++ b/frontend/src/routes/project/Kanban.svelte
@@ -49,6 +49,7 @@
async function loadTasks(selector){
const url = api('task/list');
selector.show_closed = true;
+ selector.no_index = true;
var resp = await fetch(url,{
credentials: 'include',
method:'POST',
@@ -134,7 +135,7 @@
text-align: center;
}
.highlight{
- background: red;
+ background: #4b3000;
}
@@ -157,7 +158,7 @@
{#each Object.entries(states) as [state,name]}
hover(ev,user,state)} ondrop={ev => drop(user,state)} >
{#if stateList[state]}
- {#each Object.entries(stateList[state]) as [tid,task]}
+ {#each Object.values(stateList[state]).sort((a,b) => a.name.localeCompare(b.name)) as task}
router.navigate(`/task/${task.id}/view`)} ondragstart={ev => dragged=task} >{task.name}
{/each}
{/if}
diff --git a/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java b/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
index 68022b8..4ab7677 100644
--- a/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
+++ b/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
@@ -211,10 +211,11 @@ CREATE TABLE IF NOT EXISTS {0} (
}
@Override
- public HashMap
listProjectTasks(Long projectId, Long parentTaskId) throws UmbrellaException {
+ public HashMap listProjectTasks(Long projectId, Long parentTaskId, boolean noIndex) throws UmbrellaException {
try {
var query = select(ALL).from(TABLE_TASKS).where(PROJECT_ID,equal(projectId));
if (parentTaskId != 0) query.where(PARENT_TASK_ID,equal(parentTaskId));
+ if (noIndex) query.where(NO_INDEX,equal(false));
var tasks = new HashMap();
var rs = query.exec(db);
while (rs.next()){
diff --git a/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java b/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java
index 082e9a5..0511c68 100644
--- a/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java
+++ b/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java
@@ -18,7 +18,7 @@ public interface TaskDb {
void dropMember(long projectId, long userId);
Map getMembers(Task task);
HashMap listChildrenOf(Long parentTaskId, UmbrellaUser user, boolean showClosed);
- HashMap listProjectTasks(Long projectId, Long parentTaskId) throws UmbrellaException;
+ HashMap listProjectTasks(Long projectId, Long parentTaskId, boolean noIndex) throws UmbrellaException;
HashMap listRootTasks(Long projectId, UmbrellaUser user, boolean showClosed);
HashMap listTasks(Collection projectIds) throws UmbrellaException;
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 b85c869..c63024f 100644
--- a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
+++ b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
@@ -314,11 +314,12 @@ public class TaskModule extends BaseHandler implements TaskService {
var json = json(ex);
LOG.log(WARNING,"Missing permission check in {0}.postTaskList!",getClass().getSimpleName());
var showClosed = json.has(SHOW_CLOSED) && json.get(SHOW_CLOSED) instanceof Boolean bool ? bool : false;
+ 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;
if (isSet(projectId)) {
if (parentTaskId == null) return sendContent(ex,mapValues(taskDb.listRootTasks(projectId, user,showClosed)));
- var projectTasks = taskDb.listProjectTasks(projectId,parentTaskId);
+ var projectTasks = taskDb.listProjectTasks(projectId,parentTaskId,noIndex);
loadMembers(projectTasks.values());
return sendContent(ex,mapValues(projectTasks));
}
diff --git a/translations/src/main/resources/de.json b/translations/src/main/resources/de.json
index 6497b49..a8ab23c 100644
--- a/translations/src/main/resources/de.json
+++ b/translations/src/main/resources/de.json
@@ -6,7 +6,7 @@
"add_position": "hinzufügen",
"add_subtask": "Unteraufgabe hinzufügen",
"add_task": "Aufgabe hinzufügen",
- "advertisement" : "Umbrella ist ein Produkt von {0}.",
+ "advertisement" : "Umbrella ist ein Produkt von {producer}.",
"amount": "Menge",
"bank_account": "Bankverbindung",