Compare commits

...

2 Commits

Author SHA1 Message Date
7e625cd5a5 Merge pull request 'fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd1)…' (#103) from fix-cox-join-staging into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m53s
CI/CD Pipeline / deploy-staging (push) Successful in 14m57s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #103
2023-12-28 18:20:19 +01:00
34280dbbea fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd124e6e) where I compared different ids
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m1s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-28 18:19:43 +01:00

View File

@ -144,7 +144,7 @@ WHERE day=?",
let mut ret = Vec::new(); let mut ret = Vec::new();
for event in events { for event in events {
let cox = Registration::all_cox(db, event.trip_details_id).await; let cox = Registration::all_cox(db, event.id).await;
let mut trip_type = None; let mut trip_type = None;
if let Some(trip_type_id) = event.trip_type_id { if let Some(trip_type_id) = event.trip_type_id {
trip_type = TripType::find_by_id(db, trip_type_id).await; trip_type = TripType::find_by_id(db, trip_type_id).await;