always use your own name for registrations; except if the user has the add_different_user permission

This commit is contained in:
2023-03-23 11:13:19 +01:00
parent de35247c76
commit cde862f97f
7 changed files with 49 additions and 22 deletions

View File

@ -38,6 +38,8 @@ async fn register(
);
}
let user = user::Model::find_or_create_user(&register.name, db.inner()).await;
if let Some(cox_id) = register.cox_id {
let trip = trip::Entity::find_by_id(cox_id)
.one(db.inner())
@ -57,8 +59,6 @@ async fn register(
}
}
let user = user::Model::find_or_create_user(&register.name, db.inner()).await;
let day = format!("{}", day.day.format("%Y-%m-%d"));
let trip = trip::ActiveModel {
day: Set(day.clone()),

View File

@ -16,6 +16,7 @@ async fn index(db: &State<DatabaseConnection>, user: user::AdminUser) -> Templat
struct UserEditForm {
pw: Option<String>,
is_cox: bool,
add_different_user: bool,
is_admin: bool,
}
@ -30,6 +31,7 @@ async fn update(
id: Set(id),
is_cox: Set(data.is_cox),
is_admin: Set(data.is_admin),
add_different_user: Set(data.add_different_user),
..Default::default()
};
if let Some(pw) = &data.pw {