SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

kanban no longer showing tasks having no_index flag

Browse Source
This commit is contained in:
Stephan Richter
2025-07-27 13:14:50 +02:00
parent 2fa95d38c5
commit 770f2aab5b
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/Components/Footer.svelte
View File

@@ -3,5 +3,5 @@
</script> </script>
<footer> <footer>
{@html t('advertisement','<a href="https://srsoftware.de">SRSoftware</a>')} {@html t('advertisement',{producer:'<a href="https://srsoftware.de">SRSoftware</a>'})}
</footer> </footer>

5
frontend/src/routes/project/Kanban.svelte
View File

@@ -49,6 +49,7 @@
async function loadTasks(selector){ async function loadTasks(selector){
const url = api('task/list'); const url = api('task/list');
selector.show_closed = true; selector.show_closed = true;
selector.no_index = true;
var resp = await fetch(url,{ var resp = await fetch(url,{
credentials: 'include', credentials: 'include',
method:'POST', method:'POST',
@@ -134,7 +135,7 @@
text-align: center; text-align: center;
} }
.highlight{ .highlight{
background: red; background: #4b3000;
} }
</style> </style>
@@ -157,7 +158,7 @@
{#each Object.entries(states) as [state,name]} {#each Object.entries(states) as [state,name]}
<div class={[state, highlight.user == user && highlight.state == state ? 'highlight':'']} ondragover={ev => hover(ev,user,state)} ondrop={ev => drop(user,state)} > <div class={[state, highlight.user == user && highlight.state == state ? 'highlight':'']} ondragover={ev => hover(ev,user,state)} ondrop={ev => drop(user,state)} >
{#if stateList[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}
<div draggable="true" class="box" onclick={() => router.navigate(`/task/${task.id}/view`)} ondragstart={ev => dragged=task} >{task.name}</div> <div draggable="true" class="box" onclick={() => router.navigate(`/task/${task.id}/view`)} ondragstart={ev => dragged=task} >{task.name}</div>
{/each} {/each}
{/if} {/if}

3
task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
View File

@@ -211,10 +211,11 @@ CREATE TABLE IF NOT EXISTS {0} (
} }
@Override @Override
public HashMap<Long, Task> listProjectTasks(Long projectId, Long parentTaskId) throws UmbrellaException { public HashMap<Long, Task> listProjectTasks(Long projectId, Long parentTaskId, boolean noIndex) throws UmbrellaException {
try { try {
var query = select(ALL).from(TABLE_TASKS).where(PROJECT_ID,equal(projectId)); var query = select(ALL).from(TABLE_TASKS).where(PROJECT_ID,equal(projectId));
if (parentTaskId != 0) query.where(PARENT_TASK_ID,equal(parentTaskId)); if (parentTaskId != 0) query.where(PARENT_TASK_ID,equal(parentTaskId));
if (noIndex) query.where(NO_INDEX,equal(false));
var tasks = new HashMap<Long,Task>(); var tasks = new HashMap<Long,Task>();
var rs = query.exec(db); var rs = query.exec(db);
while (rs.next()){ while (rs.next()){

2
task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java
View File

@@ -18,7 +18,7 @@ public interface TaskDb {
void dropMember(long projectId, long userId); void dropMember(long projectId, long userId);
Map<Long, Permission> getMembers(Task task); Map<Long, Permission> getMembers(Task task);
HashMap<Long, Task> listChildrenOf(Long parentTaskId, UmbrellaUser user, boolean showClosed); HashMap<Long, Task> listChildrenOf(Long parentTaskId, UmbrellaUser user, boolean showClosed);
HashMap<Long, Task> listProjectTasks(Long projectId, Long parentTaskId) throws UmbrellaException; HashMap<Long, Task> listProjectTasks(Long projectId, Long parentTaskId, boolean noIndex) throws UmbrellaException;
HashMap<Long, Task> listRootTasks(Long projectId, UmbrellaUser user, boolean showClosed); HashMap<Long, Task> listRootTasks(Long projectId, UmbrellaUser user, boolean showClosed);
HashMap<Long, Task> listTasks(Collection<Long> projectIds) throws UmbrellaException; HashMap<Long, Task> listTasks(Collection<Long> projectIds) throws UmbrellaException;

3
task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
View File

@@ -314,11 +314,12 @@ public class TaskModule extends BaseHandler implements TaskService {
var json = json(ex); var json = json(ex);
LOG.log(WARNING,"Missing permission check in {0}.postTaskList!",getClass().getSimpleName()); 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 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 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 parentTaskId = json.has(PARENT_TASK_ID) && json.get(PARENT_TASK_ID) instanceof Number number ? number.longValue() : null;
if (isSet(projectId)) { if (isSet(projectId)) {
if (parentTaskId == null) return sendContent(ex,mapValues(taskDb.listRootTasks(projectId, user,showClosed))); 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()); loadMembers(projectTasks.values());
return sendContent(ex,mapValues(projectTasks)); return sendContent(ex,mapValues(projectTasks));
} }

2
translations/src/main/resources/de.json
View File

@@ -6,7 +6,7 @@
"add_position": "hinzufügen", "add_position": "hinzufügen",
"add_subtask": "Unteraufgabe hinzufügen", "add_subtask": "Unteraufgabe hinzufügen",
"add_task": "Aufgabe hinzufügen", "add_task": "Aufgabe hinzufügen",
"advertisement" : "Umbrella ist ein Produkt von {0}.", "advertisement" : "Umbrella ist ein Produkt von {producer}.",
"amount": "Menge", "amount": "Menge",
"bank_account": "Bankverbindung", "bank_account": "Bankverbindung",