Ruderverein-Donau-Linz/rowt
1
1
Fork 1
Code Issues 49 Pull Requests Actions Packages Projects Wiki Activity

Merge pull request '[TASK] group reservations in log to avoid near-duplicates' (#419) from group-reservations-in-log into staging
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
Details
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details

Browse Source 
Reviewed-on: #419
This commit is contained in:
philipp
2024-04-23 21:11:18 +02:00
parent 3c67e0deeb 3abff08f61
commit 548c025fbc
4 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tera/log.rs
View File

@ -80,7 +80,10 @@ async fn index(
}
context.insert("boats", &boats);
context.insert("reservations", &BoatReservation::all_future(db).await);
context.insert(
"reservations",
&BoatReservation::all_future_with_groups(db).await,
);
context.insert("coxes", &coxes);
context.insert("users", &users);
context.insert("logtypes", &logtypes);
@ -171,7 +174,10 @@ async fn kiosk(
}
context.insert("boats", &boats);
context.insert("reservations", &BoatReservation::all_future(db).await);
context.insert(
"reservations",
&BoatReservation::all_future_with_groups(db).await,
);
context.insert("coxes", &coxes);
context.insert("users", &users);
context.insert("logtypes", &logtypes);