Merge pull request 'allow vorstand to send mail + notifications' (#602) from allow-vorstand-to-send-things into staging

Reviewed-on: #602

src/tera/admin/mail.rs

@@ -9,8 +9,8 @@ use sqlx::SqlitePool;
 use crate::model::log::Log;
 use crate::model::mail::Mail;
 use crate::model::role::Role;
-use crate::model::user::AdminUser;
 use crate::model::user::UserWithDetails;
+use crate::model::user::{AdminUser, VorstandUser};
 use crate::tera::Config;
 
 #[get("/mail")]
@@ -27,7 +27,7 @@ async fn index(
 
     context.insert(
         "loggedin_user",
-        &UserWithDetails::from_user(admin.user, db).await,
+        &UserWithDetails::from_user(admin.0, db).await,
     );
     context.insert("roles", &roles);
 

src/tera/admin/notification.rs

@@ -2,7 +2,7 @@ use crate::model::{
     log::Log,
     notification::Notification,
     role::Role,
-    user::{AdminUser, User, UserWithDetails, VorstandUser},
+    user::{User, UserWithDetails, VorstandUser},
 };
 use itertools::Itertools;
 use rocket::{
@@ -27,7 +27,7 @@ async fn index(
     }
     context.insert(
         "loggedin_user",
-        &UserWithDetails::from_user(user.user, db).await,
+        &UserWithDetails::from_user(user.0, db).await,
     );
 
     let users: Vec<User> = User::all(db)