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

single-user-edit-page #986

Merged
philipp merged 6 commits from single-user-edit-page into staging 2025-05-05 20:37:14 +02:00
Conversation 0 Commits 6 Files Changed 18 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9a4dcc0b9d - Show all commits

4
src/model/user/mod.rs
View File

@ -583,12 +583,12 @@ ASKÖ Ruderverein Donau Linz", self.name),
.await; .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) sqlx::query!("UPDATE user SET deleted=1 WHERE id=?", self.id)
.execute(db) .execute(db)
.await .await
.unwrap(); //Okay, because we can only create a User of a valid id .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) .relevant_for_user(self)
.save(db) .save(db)
.await; .await;

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

@ -286,7 +286,7 @@ async fn delete(db: &State<SqlitePool>, admin: ManageUserUser, user: i32) -> Fla
Log::create(db, format!("{} deleted user: {user:?}", admin.user.name)).await; Log::create(db, format!("{} deleted user: {user:?}", admin.user.name)).await;
match user { match user {
Some(user) => { Some(user) => {
user.delete(db).await; user.delete(db, &admin).await;
Flash::success( Flash::success(
Redirect::to("/admin/user"), Redirect::to("/admin/user"),
format!("Benutzer {} gelöscht", user.name), format!("Benutzer {} gelöscht", user.name),