Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Merge pull request 'allow vorstand to send mail + notifications' (#603) from allow-vorstand-to-send-things into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m5s
Details
CI/CD Pipeline / deploy-staging (push) Has been skipped
Details
CI/CD Pipeline / deploy-main (push) Successful in 6m27s
Details

Browse Source 
Reviewed-on: #603
This commit is contained in:
philipp 2024-06-21 11:25:27 +02:00
commit 79f8efc34b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tera/admin/mail.rs
View File

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

4
src/tera/admin/notification.rs
View File

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