Compare commits
No commits in common. "e7732b9e967005b754b6c46f28ea2a9dee76d6d4" and "97dc9308bcc72ab658efbb07c9c9d3d2b75cef93" have entirely different histories.
e7732b9e96
...
97dc9308bc
@ -242,11 +242,11 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
|
||||
.await
|
||||
.unwrap(); //Okay, as planned_event can only be created with proper DB backing
|
||||
|
||||
if update.max_people == 0 && !was_already_cancelled {
|
||||
if max_people == 0 && !was_already_cancelled {
|
||||
let coxes = Registration::all_cox(db, self.id).await;
|
||||
for user in coxes {
|
||||
if let Some(user) = User::find_by_name(db, &user.name).await {
|
||||
let notes = match update.notes {
|
||||
let notes = match notes {
|
||||
Some(n) if !n.is_empty() => n,
|
||||
_ => ".",
|
||||
};
|
||||
@ -269,7 +269,7 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
|
||||
let rower = Registration::all_rower(db, self.trip_details_id).await;
|
||||
for user in rower {
|
||||
if let Some(user) = User::find_by_name(db, &user.name).await {
|
||||
let notes = match update.notes {
|
||||
let notes = match notes {
|
||||
Some(n) if !n.is_empty() => n,
|
||||
_ => ".",
|
||||
};
|
||||
@ -292,7 +292,7 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
|
||||
}
|
||||
}
|
||||
}
|
||||
if update.max_people > 0 && was_already_cancelled {
|
||||
if max_people > 0 && was_already_cancelled {
|
||||
Notification::delete_by_action(
|
||||
db,
|
||||
&format!("remove_user_trip_with_trip_details_id:{}", tripdetails.id),
|
||||
|
Loading…
Reference in New Issue
Block a user