Merge branch 'main' into dev

This commit is contained in:
2025-10-20 13:38:32 +02:00
6 changed files with 35 additions and 10 deletions

View File

@@ -53,7 +53,8 @@
function show(e){
e.preventDefault();
let href = e.target.getAttribute('href');
let target = e.currentTarget;
let href = target.getAttribute('href');
if (href) router.navigate(href);
return false;
}
@@ -91,18 +92,18 @@
<tbody>
{#each sortedProjects as project}
<tr>
<td class="name">
<td class="name" onclick={show} href={`/project/${project.id}/view`} >
<a href={`/project/${project.id}/view`} onclick={show}>{project.name}</a>
</td>
<td class="company">
<td class="company" onclick={show} href={`/project/${project.id}/view`} >
{#if project.company_id && companies[project.company_id]}
<a href={`/company/${companies[project.company_id]}/view`} onclick={show}>{companies[project.company_id].name}</a>
{companies[project.company_id].name}
{/if}
</td>
<td class="state">
<td class="state" onclick={show} href={`/project/${project.id}/view`} >
<a href={`/project/${project.id}/view`} onclick={show}>{t("state_"+project.allowed_states[project.status]?.toLowerCase())}</a>
</td>
<td class="members" >
<td class="members" onclick={show} href={`/project/${project.id}/view`} >
<a href={`/project/${project.id}/view`} onclick={show}>
{#each Object.entries(project.members) as [uid,member]}
<div>{member.user.name}</div>
@@ -110,7 +111,7 @@
</a>
</td>
<td class="actions">
<button class="edit symbol" title={t('edit')}></button>
<!-- <button class="edit symbol" title={t('edit')}></button> -->
{#if project.status < 60}
<button class="complete symbol" title={t('complete')} onclick={() => setState(project.id,'COMPLETE')} ></button>
<button class="abort symbol" title={t('abort')} onclick={() => setState(project.id,'CANCELLED')} ></button>