Merge pull request 'allow vorstand to see all old logs' (#848) from vorstand-show-old-logs into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 7m44s

Reviewed-on: #848
This commit is contained in:
philipp 2025-01-10 09:52:56 +01:00
commit 87de3859a2
2 changed files with 3 additions and 3 deletions

View File

@ -27,7 +27,7 @@ use crate::{
},
logtype::LogType,
trip::Trip,
user::{AdminUser, DonauLinzUser, User, UserWithDetails, VorstandUser},
user::{DonauLinzUser, User, UserWithDetails, VorstandUser},
},
tera::Config,
};
@ -118,7 +118,7 @@ async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
}
#[get("/show?<year>", rank = 2)]
async fn show_for_year(db: &State<SqlitePool>, user: AdminUser, year: i32) -> Template {
async fn show_for_year(db: &State<SqlitePool>, user: VorstandUser, year: i32) -> Template {
let logs = Logbook::completed_in_year(db, year).await;
Template::render(

View File

@ -5,7 +5,7 @@
<div class="max-w-screen-lg w-full">
<h1 class="h1">
Logbuch
{% if loggedin_user and "admin" in loggedin_user.roles %}
{% if loggedin_user and "Vorstand" in loggedin_user.roles %}
<select id="yearSelect"
onchange="changeYear()"
style="background: transparent;