From 72a8d6c8cff8869019c3ce0cb1a38f806d964604 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 31 May 2025 13:38:01 +0200 Subject: convert all manual message stuff to FlashMessage --- server/src/ui/admin/user.rs | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'server/src/ui/admin/user.rs') diff --git a/server/src/ui/admin/user.rs b/server/src/ui/admin/user.rs index afbe8f0..fa84f52 100644 --- a/server/src/ui/admin/user.rs +++ b/server/src/ui/admin/user.rs @@ -5,13 +5,22 @@ */ use crate::{helper::RequestInfo, ui::error::MyResult}; use anyhow::Context; -use jellycommon::user::UserPermission; +use jellycommon::{ + routes::{u_admin_user, u_admin_users}, + user::UserPermission, +}; use jellylogic::admin::user::{admin_users, delete_user, get_user, update_user_perms, GrantState}; use jellyui::{ admin::user::{AdminUserPage, AdminUsersPage}, + locale::tr, render_page, }; -use rocket::{form::Form, get, post, response::content::RawHtml, FromForm, FromFormField}; +use rocket::{ + form::Form, + get, post, + response::{content::RawHtml, Flash, Redirect}, + FromForm, FromFormField, +}; #[get("/admin/users")] pub fn r_admin_users(ri: RequestInfo) -> MyResult> { @@ -19,7 +28,7 @@ pub fn r_admin_users(ri: RequestInfo) -> MyResult> { let r = admin_users(&ri.session)?; Ok(RawHtml(render_page( &AdminUsersPage { - flash: None, + flash: &None, lang: &ri.lang, users: &r.users, }, @@ -34,7 +43,7 @@ pub fn r_admin_user<'a>(ri: RequestInfo, name: &'a str) -> MyResult, name: &str, -) -> MyResult> { +) -> MyResult> { ri.session.assert_admin()?; let perm = serde_json::from_str::(&form.permission) .context("parsing provided permission")?; @@ -76,30 +85,21 @@ pub fn r_admin_user_permission( }, )?; - let user = get_user(&ri.session, name)?; - - Ok(RawHtml(render_page( - &AdminUserPage { - flash: Some(Ok("Permissions updated".to_string())), - lang: &ri.lang, - user: &user, - }, - ri.render_info(), - ))) + Ok(Flash::success( + Redirect::to(u_admin_user(name)), + tr( + ri.lang, + &"admin.users.permission_update_success".to_string(), + ), + )) } #[post("/admin//remove")] -pub fn r_admin_remove_user(ri: RequestInfo, name: &str) -> MyResult> { +pub fn r_admin_remove_user(ri: RequestInfo, name: &str) -> MyResult> { ri.session.assert_admin()?; delete_user(&ri.session, name)?; - let r = admin_users(&ri.session)?; - - Ok(RawHtml(render_page( - &AdminUsersPage { - flash: Some(Ok("User removed".to_string())), - lang: &ri.lang, - users: &r.users, - }, - ri.render_info(), - ))) + Ok(Flash::success( + Redirect::to(u_admin_users()), + tr(ri.lang, &"admin.users.remove_success".to_string()), + )) } -- cgit v1.2.3-70-g09d2