update #702

Merged
philipp merged 8 commits from update into staging 2024-08-21 16:35:42 +02:00
2 changed files with 3 additions and 7 deletions
Showing only changes of commit d971c1504c - Show all commits

View File

@ -9,11 +9,7 @@ use serde::Serialize;
use sqlx::{FromRow, Row, SqlitePool}; use sqlx::{FromRow, Row, SqlitePool};
use super::{ use super::{
notification::Notification, notification::Notification, role::Role, tripdetails::TripDetails, triptype::TripType,
role::Role,
trip,
tripdetails::{self, TripDetails},
triptype::TripType,
user::User, user::User,
}; };

View File

@ -437,8 +437,8 @@ async fn schnupper_to_scheckbuch(
let scheckbuch = Role::find_by_name(db, "scheckbuch").await.unwrap(); let scheckbuch = Role::find_by_name(db, "scheckbuch").await.unwrap();
user.add_role(db, &scheckbuch).await; user.add_role(db, &scheckbuch).await;
if let Some(noEinschreibgebuehr) = Role::find_by_name(db, "no-einschreibgebuehr").await { if let Some(no_einschreibgebuehr) = Role::find_by_name(db, "no-einschreibgebuehr").await {
user.add_role(db, &noEinschreibgebuehr).await; user.add_role(db, &no_einschreibgebuehr).await;
} }
user.send_welcome_email(db, &config.smtp_pw).await.unwrap(); user.send_welcome_email(db, &config.smtp_pw).await.unwrap();