Merge branch 'main' into reservations
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m52s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped

This commit is contained in:
philipp 2024-04-02 11:19:51 +02:00
commit 1783527f39
2 changed files with 2 additions and 2 deletions

View File

@ -62,7 +62,7 @@ impl Trip {
&user, &user,
&format!( &format!(
"{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt", "{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt",
user.name, trip.day, trip.planned_starting_time cox.user.name, trip.day, trip.planned_starting_time
), ),
"Neue Ausfahrt zur selben Zeit".into(), "Neue Ausfahrt zur selben Zeit".into(),
None, None,

View File

@ -733,7 +733,7 @@ impl<'r> FromRequest<'r> for TechUser {
} }
pub struct CoxUser { pub struct CoxUser {
user: User, pub(crate) user: User,
} }
impl Deref for CoxUser { impl Deref for CoxUser {