diff --git a/src/model/user/mod.rs b/src/model/user/mod.rs index 0539e08..2b8bd75 100644 --- a/src/model/user/mod.rs +++ b/src/model/user/mod.rs @@ -583,12 +583,12 @@ ASKÖ Ruderverein Donau Linz", self.name), .await; } - pub async fn delete(&self, db: &SqlitePool) { + pub async fn delete(&self, db: &SqlitePool, deleted_by: &ManageUserUser) { sqlx::query!("UPDATE user SET deleted=1 WHERE id=?", self.id) .execute(db) .await .unwrap(); //Okay, because we can only create a User of a valid id - ActivityBuilder::new(&format!("User {self} wurde gelöscht.")) + ActivityBuilder::new(&format!("User {self} wurde von {deleted_by} gelöscht.")) .relevant_for_user(self) .save(db) .await; diff --git a/src/tera/admin/user.rs b/src/tera/admin/user.rs index 7978cf9..48569fa 100644 --- a/src/tera/admin/user.rs +++ b/src/tera/admin/user.rs @@ -286,7 +286,7 @@ async fn delete(db: &State, admin: ManageUserUser, user: i32) -> Fla Log::create(db, format!("{} deleted user: {user:?}", admin.user.name)).await; match user { Some(user) => { - user.delete(db).await; + user.delete(db, &admin).await; Flash::success( Redirect::to("/admin/user"), format!("Benutzer {} gelöscht", user.name),