diff --git a/frontend/src/Components/LineEditor.svelte b/frontend/src/Components/LineEditor.svelte
index b360e70..bc8171b 100644
--- a/frontend/src/Components/LineEditor.svelte
+++ b/frontend/src/Components/LineEditor.svelte
@@ -5,7 +5,8 @@
let {
simple = false,
editable = simple,
- onclick = evt => { startEdit() },
+ href = '#',
+ onclick = evt => { evt.preventDefault(); startEdit(); return false },
onSet = newVal => {return true;},
type = 'div',
value = $bindable(null)
@@ -91,5 +92,5 @@
{#if editable && editing}
{:else}
-{value}
+{value}
{/if}
diff --git a/frontend/src/routes/project/List.svelte b/frontend/src/routes/project/List.svelte
index 2f512cd..fce9a9f 100644
--- a/frontend/src/routes/project/List.svelte
+++ b/frontend/src/routes/project/List.svelte
@@ -49,9 +49,10 @@
}
}
- function show(e,pid){
+ function show(e){
e.preventDefault();
- router.navigate(`/project/${pid}/view`);
+ let href = e.target.getAttribute('href');
+ if (href) router.navigate(href);
return false;
}
@@ -92,20 +93,22 @@
{#each sortedProjects as project}
|
- show(e,project.id)}>{project.name}
+ {project.name}
|
- show(project.id)} >
+ |
{#if project.company_id && companies[project.company_id]}
- {companies[project.company_id].name}
+ {companies[project.company_id].name}
{/if}
|
- show(project.id)} >
- {t("state_"+project.allowed_states[project.status]?.toLowerCase())}
+ |
+ {t("state_"+project.allowed_states[project.status]?.toLowerCase())}
|
- show(project.id)} >
+ |
+
{#each Object.entries(project.members) as [uid,member]}
{member.user.name}
{/each}
+
|
diff --git a/frontend/src/routes/task/ListTask.svelte b/frontend/src/routes/task/ListTask.svelte
index f409ea7..3f2b6b7 100644
--- a/frontend/src/routes/task/ListTask.svelte
+++ b/frontend/src/routes/task/ListTask.svelte
@@ -103,8 +103,11 @@
}
}
- function openTask(){
- router.navigate(`/task/${task.id}/view`);
+ function openTask(e){
+ e.preventDefault();
+ let href = e.target.getAttribute('href');
+ if (href) router.navigate(href);
+ return false;
}
async function patchTask(changeset){
@@ -143,7 +146,7 @@
{#if !deleted}
e.preventDefault()} {ondragstart} class="task {states[task.status]?.toLowerCase()}">
-
+
{#if task.estimated_time}
({+task.estimated_time} h)
{/if}
diff --git a/frontend/src/urls.svelte.js b/frontend/src/urls.svelte.js
index cd685d6..9a5742c 100644
--- a/frontend/src/urls.svelte.js
+++ b/frontend/src/urls.svelte.js
@@ -1,3 +1,3 @@
export function api(rel_path){
return `${location.protocol}//${location.host.replace('5173','8080')}/api/${rel_path}`;
-}
\ No newline at end of file
+}
|