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

Compare commits

base: Ruderverein-Donau-Linz:96036b180b41de2592c634d48d5e2c2f2081ceb0
Branches Tags
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:test
..
compare: Ruderverein-Donau-Linz:c98f33e138a0f86289bcbd8946cf90afb189239f
Branches Tags
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:test

No commits in common. "96036b180b41de2592c634d48d5e2c2f2081ceb0" and "c98f33e138a0f86289bcbd8946cf90afb189239f" have entirely different histories.
96036b180b ... c98f33e138

1 changed files with 4 additions and 18 deletions
Show Stats Expand all files Collapse all files

22
src/tera/log.rs
View File

@ -58,9 +58,7 @@ async fn index(
.map(|user| UserWithWaterStatus::from_user(user, db)), .map(|user| UserWithWaterStatus::from_user(user, db)),
) )
.await; .await;
coxes.retain(|u| { coxes.retain(|u| u.roles.contains(&"Donau Linz".into()));
u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
});
let mut users: Vec<UserWithWaterStatus> = futures::future::join_all( let mut users: Vec<UserWithWaterStatus> = futures::future::join_all(
User::all(db) User::all(db)
@ -69,9 +67,7 @@ async fn index(
.map(|user| UserWithWaterStatus::from_user(user, db)), .map(|user| UserWithWaterStatus::from_user(user, db)),
) )
.await; .await;
users.retain(|u| { users.retain(|u| u.roles.contains(&"Donau Linz".into()));
u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
});
let logtypes = LogType::all(db).await; let logtypes = LogType::all(db).await;
let distances = Logbook::distances(db).await; let distances = Logbook::distances(db).await;
@ -153,30 +149,20 @@ async fn kiosk(
_kiosk: KioskCookie, _kiosk: KioskCookie,
) -> Template { ) -> Template {
let boats = Boat::all(db).await; let boats = Boat::all(db).await;
let mut coxes: Vec<UserWithWaterStatus> = futures::future::join_all( let coxes: Vec<UserWithWaterStatus> = futures::future::join_all(
User::cox(db) User::cox(db)
.await .await
.into_iter() .into_iter()
.map(|user| UserWithWaterStatus::from_user(user, db)), .map(|user| UserWithWaterStatus::from_user(user, db)),
) )
.await; .await;
let users: Vec<UserWithWaterStatus> = futures::future::join_all(
coxes.retain(|u| {
u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
});
let mut users: Vec<UserWithWaterStatus> = futures::future::join_all(
User::all(db) User::all(db)
.await .await
.into_iter() .into_iter()
.map(|user| UserWithWaterStatus::from_user(user, db)), .map(|user| UserWithWaterStatus::from_user(user, db)),
) )
.await; .await;
users.retain(|u| {
u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
});
let logtypes = LogType::all(db).await; let logtypes = LogType::all(db).await;
let distances = Logbook::distances(db).await; let distances = Logbook::distances(db).await;