From 10a0e8239285911a856fd07b7bce44292627d341 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Tue, 5 Mar 2024 09:33:18 +0100
Subject: [PATCH 1/4] fix ci

---
 src/tera/log.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tera/log.rs b/src/tera/log.rs
index e2dca51..e5fba0c 100644
--- a/src/tera/log.rs
+++ b/src/tera/log.rs
@@ -96,7 +96,7 @@ async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
     )
 }
 
-#[get("/show?<year>")]
+#[get("/show?<year>", rank = 2)]
 async fn show_for_year(db: &State<SqlitePool>, user: AdminUser, year: i32) -> Template {
     let logs = Logbook::completed_in_year(db, year).await;
 

From 1a482db9e245af060f7e8329e6d985ccc744563d Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Tue, 5 Mar 2024 09:34:50 +0100
Subject: [PATCH 2/4] fix ci

---
 src/tera/log.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tera/log.rs b/src/tera/log.rs
index e5fba0c..3ff330b 100644
--- a/src/tera/log.rs
+++ b/src/tera/log.rs
@@ -86,7 +86,7 @@ async fn index(
     Template::render("log", context.into_json())
 }
 
-#[get("/show", rank = 2)]
+#[get("/show", rank = 3)]
 async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
     let logs = Logbook::completed(db).await;
 

From 6f5fcd59ea3cf7fa807bb6187945948935283580 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Tue, 5 Mar 2024 09:45:54 +0100
Subject: [PATCH 3/4] fix ci

---
 templates/log.completed.html.tera | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/log.completed.html.tera b/templates/log.completed.html.tera
index 1edaefa..0b2b75c 100644
--- a/templates/log.completed.html.tera
+++ b/templates/log.completed.html.tera
@@ -5,7 +5,7 @@
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">
             Logbuch
-            {% if "admin" in loggedin_user.roles %}
+            {% if loggedin_user and "admin" in loggedin_user.roles %}
                 <select id="yearSelect"
                         onchange="changeYear()"
                         style="background: transparent;

From 94b622a5e7234af47f70e7bc8dc737961209e7d4 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Tue, 5 Mar 2024 13:45:19 +0100
Subject: [PATCH 4/4] update filter

---
 src/model/user.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/model/user.rs b/src/model/user.rs
index 9ae4a3d..f1990b6 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -518,6 +518,11 @@ ORDER BY last_access DESC
                 "m.birner",
                 "m-sageder",
                 "a-almousa",
+                "m.sageder",
+                "a.almousa",
+                "p.hofer",
+                "d.kortschak",
+                "[login]",
             ]
             .contains(&name)
             {