in preparation to moving userdata into app, we switched to arbitrary groups

This commit is contained in:
2023-12-23 21:27:52 +01:00
parent 54c013ec10
commit 9fb4167b50
29 changed files with 396 additions and 256 deletions

View File

@ -16,7 +16,7 @@ use crate::model::{
log::Log,
tripdetails::TripDetails,
triptype::TripType,
user::User,
user::{User, UserWithRoles},
usertrip::{UserTrip, UserTripDeleteError, UserTripError},
};
@ -47,7 +47,7 @@ async fn wikiauth(db: &State<SqlitePool>, login: Form<LoginForm<'_>>) -> String
async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_>>) -> Template {
let mut context = Context::new();
if user.is_cox || user.is_admin {
if user.has_role(db, "cox").await || user.has_role(db, "admin").await {
let triptypes = TripType::all(db).await;
context.insert("trip_types", &triptypes);
}
@ -57,8 +57,8 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
if let Some(msg) = flash {
context.insert("flash", &msg.into_inner());
}
context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
context.insert("loggedin_user", &user);
context.insert("days", &days);
Template::render("index", context.into_json())
}