diff options
Diffstat (limited to 'ui/src/admin')
-rw-r--r-- | ui/src/admin/mod.rs | 6 | ||||
-rw-r--r-- | ui/src/admin/user.rs | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ui/src/admin/mod.rs b/ui/src/admin/mod.rs index 394f1c6..c2afc9d 100644 --- a/ui/src/admin/mod.rs +++ b/ui/src/admin/mod.rs @@ -7,7 +7,7 @@ pub mod log; pub mod user; -use crate::{locale::{tr, Language}, scaffold::FlashDisplay, Page}; +use crate::{FlashM, Page, locale::Language, scaffold::FlashDisplay}; use jellycommon::routes::{ u_admin_import, u_admin_invite_create, u_admin_invite_remove, u_admin_log, u_admin_update_search, u_admin_users, @@ -23,9 +23,9 @@ impl Page for AdminDashboardPage<'_> { } markup::define!( - AdminDashboardPage<'a>(lang: &'a Language, busy: Option<&'static str>, last_import_err: &'a [String], flash: Option<Result<String, String>>, invites: &'a [String]) { + AdminDashboardPage<'a>(lang: &'a Language, busy: Option<&'static str>, last_import_err: &'a [String], flash: &'a FlashM, invites: &'a [String]) { h1 { "Admin Panel" } - @FlashDisplay { flash: flash.clone() } + @FlashDisplay { flash } @if !last_import_err.is_empty() { section.message.error { details { 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(!)"]; |