From 97fdfb3d55a817cd96294ea72201cf1756805a96 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Mon, 9 Mar 2026 11:16:13 +0100 Subject: [PATCH] checked/improved permissions, improved sorting Signed-off-by: Stephan Richter --- frontend/src/routes/poll/Evaluate.svelte | 2 +- frontend/src/routes/poll/Index.svelte | 11 ++++------- frontend/src/routes/poll/View.svelte | 3 ++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/frontend/src/routes/poll/Evaluate.svelte b/frontend/src/routes/poll/Evaluate.svelte index c1517185..1078004f 100644 --- a/frontend/src/routes/poll/Evaluate.svelte +++ b/frontend/src/routes/poll/Evaluate.svelte @@ -71,7 +71,7 @@ {average(hist)} - {#each Object.entries(hist) as [weight,count]} + {#each Object.entries(hist).sort((a,b) => a[0] - b[0]) as [weight,count]} {weight} diff --git a/frontend/src/routes/poll/Index.svelte b/frontend/src/routes/poll/Index.svelte index a3255601..3c068d8b 100644 --- a/frontend/src/routes/poll/Index.svelte +++ b/frontend/src/routes/poll/Index.svelte @@ -44,10 +44,6 @@ router.navigate(`/poll/${poll.id}/view`); } - function share(poll){ - router.navigate(`/poll/${poll.id}/share`); - } - onMount(load); @@ -70,13 +66,14 @@ {@html poll.description.rendered} open(poll)}>{poll.owner.name} - {#if user.id == poll.owner.id || poll.permission[user.id].permission == 2} + {#if user.id} + {#if user.id == poll.owner.id || (poll.permission[user.id] && poll.permission[user.id].permission.code == 2)} {/if} - {#if user.id == poll.owner.id || poll.permission[user.id].permission > 0} + {#if user.id == poll.owner.id || (poll.permission[user.id] && poll.permission[user.id].permission.code > 0)} {/if} - + {/if} {/each} diff --git a/frontend/src/routes/poll/View.svelte b/frontend/src/routes/poll/View.svelte index 3fbe9567..8dad43ec 100644 --- a/frontend/src/routes/poll/View.svelte +++ b/frontend/src/routes/poll/View.svelte @@ -17,6 +17,7 @@ if (res.ok){ poll = await res.json(); yikes(); + console.log(Object.entries(poll.weights).sort((a,b) => a[0] - b[0])); } else error(res); } @@ -67,7 +68,7 @@ {t('option')} - {#each Object.entries(poll.weights) as [weight,name]} + {#each Object.entries(poll.weights).sort((a,b) => a[0] - b[0]) as [weight,name]} {weight}