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

Merge pull request 'main' (#111) from main into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Waiting to run
Details
CI/CD Pipeline / deploy-main (push) Waiting to run
Details
CI/CD Pipeline / test (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #111
This commit is contained in:
philipp 2024-01-01 16:30:52 +01:00
commit 29e7142883
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/model/mod.rs
View File

@ -24,7 +24,7 @@ pub mod triptype;
pub mod user; pub mod user;
pub mod usertrip; pub mod usertrip;
#[derive(Serialize)] #[derive(Serialize, Debug)]
pub struct Day { pub struct Day {
day: NaiveDate, day: NaiveDate,
planned_events: Vec<PlannedEventWithUserAndTriptype>, planned_events: Vec<PlannedEventWithUserAndTriptype>,

2
src/model/trip.rs
View File

@ -25,7 +25,7 @@ pub struct Trip {
is_locked: bool, is_locked: bool,
} }
#[derive(Serialize)] #[derive(Serialize, Debug)]
pub struct TripWithUserAndType { pub struct TripWithUserAndType {
#[serde(flatten)] #[serde(flatten)]
pub trip: Trip, pub trip: Trip,

1
src/tera/mod.rs
View File

@ -57,7 +57,6 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
if let Some(msg) = flash { if let Some(msg) = flash {
context.insert("flash", &msg.into_inner()); context.insert("flash", &msg.into_inner());
} }
println!("{user:#?}");
context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await); context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
context.insert("days", &days); context.insert("days", &days);
Template::render("index", context.into_json()) Template::render("index", context.into_json())