Merge branch 'main' into reservations

Merge pull request 'fix-notification-content' (#334 ) from fix-notification-content into main
Reviewed-on: #334
2024-04-02 11:19:51 +02:00 · 2024-04-02 10:38:19 +02:00 · 2024-04-02 10:37:15 +02:00 · 2024-04-02 10:34:50 +02:00
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 {
Author	SHA1	Message	Date
philipp	1783527f39	Merge branch 'main' into reservations All checks were successful CI/CD Pipeline / test (push) Successful in 10m52s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2024-04-02 11:19:51 +02:00
philipp	e7a679541b	Merge pull request 'fix-notification-content' (#334 ) from fix-notification-content into main All checks were successful CI/CD Pipeline / test (push) Successful in 10m18s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 5m0s Details Reviewed-on: #334	2024-04-02 10:38:19 +02:00
philipp	c1d46a6e6b	fix ci Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-04-02 10:37:15 +02:00
philipp	1c43d83bd4	use proper name :-) Some checks failed CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-04-02 10:34:50 +02:00