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

Merge pull request 'fix-ci' (#286) from fix-ci into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details
CI/CD Pipeline / test (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #286
This commit is contained in:
philipp 2024-03-20 21:27:44 +01:00
commit 638c13bc53
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/model/user.rs
View File

@ -1,16 +1,11 @@
use std::{ use std::ops::{Deref, DerefMut};
fs::File,
io::Read,
ops::{Deref, DerefMut},
};
use argon2::{password_hash::SaltString, Argon2, PasswordHasher}; use argon2::{password_hash::SaltString, Argon2, PasswordHasher};
use chrono::{Datelike, Local, NaiveDate}; use chrono::{Datelike, Local, NaiveDate};
use log::info; use log::info;
use rocket::{ use rocket::{
async_trait, async_trait,
data::ToByteUnit, http::{Cookie, Status},
http::{ext::IntoCollection, Cookie, Status},
request::{self, FromRequest, Outcome}, request::{self, FromRequest, Outcome},
time::{Duration, OffsetDateTime}, time::{Duration, OffsetDateTime},
tokio::io::AsyncReadExt, tokio::io::AsyncReadExt,
@ -1069,6 +1064,7 @@ mod test {
phone: None, phone: None,
address: None, address: None,
family_id: None, family_id: None,
membership_pdf: None,
}, },
) )
.await; .await;

2
src/tera/admin/user.rs
View File

@ -15,7 +15,7 @@ use rocket::{
http::{ContentType, Status}, http::{ContentType, Status},
post, post,
request::{FlashMessage, FromRequest, Outcome}, request::{FlashMessage, FromRequest, Outcome},
response::{content, Flash, Redirect}, response::{Flash, Redirect},
routes, FromForm, Request, Route, State, routes, FromForm, Request, Route, State,
}; };
use rocket_dyn_templates::{tera::Context, Template}; use rocket_dyn_templates::{tera::Context, Template};