staging #248

Merged
philipp merged 4 commits from staging into main 2024-03-05 13:46:00 +01:00
3 changed files with 8 additions and 3 deletions

View File

@ -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)
{

View File

@ -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;
@ -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;

View File

@ -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;