From 72a8d6c8cff8869019c3ce0cb1a38f806d964604 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 31 May 2025 13:38:01 +0200
Subject: convert all manual message stuff to FlashMessage

---
 ui/src/admin/user.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ui/src/admin/user.rs')

diff --git a/ui/src/admin/user.rs b/ui/src/admin/user.rs
index 613fc08..225482e 100644
--- a/ui/src/admin/user.rs
+++ b/ui/src/admin/user.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 
-use crate::{Page, locale::Language, scaffold::FlashDisplay};
+use crate::{FlashM, Page, locale::Language, scaffold::FlashDisplay};
 use jellycommon::{
     routes::{u_admin_user, u_admin_user_permission, u_admin_user_remove, u_admin_users},
     user::{PermissionSet, User, UserPermission},
@@ -28,9 +28,9 @@ impl Page for AdminUsersPage<'_> {
 }
 
 markup::define! {
-    AdminUsersPage<'a>(lang: &'a Language, users: &'a [User], flash: Option<Result<String, String>>) {
+    AdminUsersPage<'a>(lang: &'a Language, users: &'a [User], flash: &'a FlashM) {
         h1 { "User Management" }
-        @FlashDisplay { flash: flash.clone() }
+        @FlashDisplay { flash }
         h2 { "All Users" }
         ul { @for u in *users {
             li {
@@ -38,10 +38,10 @@ markup::define! {
             }
         }}
     }
-    AdminUserPage<'a>(lang: &'a Language, user: &'a User, flash: Option<Result<String, String>>) {
+    AdminUserPage<'a>(lang: &'a Language, user: &'a User, flash: &'a FlashM) {
         h1 { @format!("{:?}", user.display_name) " (" @user.name ")" }
         a[href=u_admin_users()] "Back to the User List"
-        @FlashDisplay { flash: flash.clone() }
+        @FlashDisplay { flash }
         form[method="POST", action=u_admin_user_remove(&user.name)] {
             // input[type="text", name="name", value=&user.name, hidden];
             input.danger[type="submit", value="Remove user(!)"];
-- 
cgit v1.2.3-70-g09d2