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

Logbuch - {% if "admin" in loggedin_user.roles %} + {% if loggedin_user and "admin" in loggedin_user.roles %}