Merge branch 'main' into reservations
This commit is contained in:
commit
1783527f39
@ -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,
|
||||||
|
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user