membership-pdf-new #284

Merged
philipp merged 45 commits from membership-pdf-new into staging 2024-03-20 21:05:23 +01:00
2 changed files with 19 additions and 13 deletions
Showing only changes of commit ef6fc3a349 - Show all commits

View File

@ -108,6 +108,12 @@ pub struct Fee {
pub paid: bool, pub paid: bool,
} }
impl Default for Fee {
fn default() -> Self {
Self::new()
}
}
impl Fee { impl Fee {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
@ -790,18 +796,18 @@ impl<'r> FromRequest<'r> for AllowedForPlannedTripsUser {
} }
} }
impl Into<User> for AllowedForPlannedTripsUser { impl From<AllowedForPlannedTripsUser> for User {
fn into(self) -> User { fn from(val: AllowedForPlannedTripsUser) -> Self {
self.0 val.0
} }
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct DonauLinzUser(pub(crate) User); pub struct DonauLinzUser(pub(crate) User);
impl Into<User> for DonauLinzUser { impl From<DonauLinzUser> for User {
fn into(self) -> User { fn from(val: DonauLinzUser) -> Self {
self.0 val.0
} }
} }
@ -839,9 +845,9 @@ impl<'r> FromRequest<'r> for DonauLinzUser {
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct VorstandUser(pub(crate) User); pub struct VorstandUser(pub(crate) User);
impl Into<User> for VorstandUser { impl From<VorstandUser> for User {
fn into(self) -> User { fn from(val: VorstandUser) -> Self {
self.0 val.0
} }
} }
@ -876,9 +882,9 @@ impl<'r> FromRequest<'r> for VorstandUser {
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct PlannedEventUser(pub(crate) User); pub struct PlannedEventUser(pub(crate) User);
impl Into<User> for PlannedEventUser { impl From<PlannedEventUser> for User {
fn into(self) -> User { fn from(val: PlannedEventUser) -> Self {
self.0 val.0
} }
} }

View File

@ -68,7 +68,7 @@ async fn list(db: &State<SqlitePool>, _admin: AdminUser, list_form: Form<ListFor
result: names_not_in_acceptable_users result: names_not_in_acceptable_users
}; };
Template::render("admin/list/result", &context) Template::render("admin/list/result", context)
} }
pub fn routes() -> Vec<Route> { pub fn routes() -> Vec<Route> {