Merge branch 'main' into reservations

2024-04-02 11:19:51 +02:00 · 2024-04-02 11:19:51 +02:00 · 1783527f39
commit 1783527f39
parent 6fb27d52d6 e7a679541b
2 changed files with 2 additions and 2 deletions
--- a/src/model/trip.rs
+++ b/src/model/trip.rs
@ -62,7 +62,7 @@ impl Trip {
                            &user,
                            &format!(
                                "{} 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(),
                            None,
--- a/src/model/user.rs
+++ b/src/model/user.rs
@ -733,7 +733,7 @@ impl<'r> FromRequest<'r> for TechUser {
 }

 pub struct CoxUser {
-    user: User,
+    pub(crate) user: User,
 }

 impl Deref for CoxUser {