diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-02-27 14:40:15 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-02-27 14:40:15 +0100 |
| commit | c05bfcc2775f0e11db6e856bfcf06d0419c35d54 (patch) | |
| tree | ffd0e9fcf6b476a6198287085a514cfa7940c200 /server/src/ui/account/settings.rs | |
| parent | 4ba86694e393c61107e27c4127efc0455b329524 (diff) | |
| download | jellything-c05bfcc2775f0e11db6e856bfcf06d0419c35d54.tar jellything-c05bfcc2775f0e11db6e856bfcf06d0419c35d54.tar.bz2 jellything-c05bfcc2775f0e11db6e856bfcf06d0419c35d54.tar.zst | |
ui changed before object slices
Diffstat (limited to 'server/src/ui/account/settings.rs')
| -rw-r--r-- | server/src/ui/account/settings.rs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/server/src/ui/account/settings.rs b/server/src/ui/account/settings.rs index c1068f6..9a98c09 100644 --- a/server/src/ui/account/settings.rs +++ b/server/src/ui/account/settings.rs @@ -4,22 +4,20 @@ Copyright (C) 2026 metamuffin <metamuffin.org> */ use super::format_form_error; -use crate::{ - auth::hash_password, request_info::RequestInfo, ui::error::MyResult, ui_responder::UiResponse, -}; +use crate::{auth::hash_password, request_info::RequestInfo, ui::error::MyResult}; use anyhow::anyhow; use jellycommon::{ - jellyobject::{OBB, Object, ObjectBuffer, Path, Tag}, + jellyobject::{Object, ObjectBuffer, Path, Tag}, routes::u_account_settings, *, }; use jellydb::{Filter, Query}; -use jellyui::tr; +use jellyui::{components::user::UserSettings, tr}; use rocket::{ FromForm, form::{self, Contextual, Form, validate::len}, get, post, - response::{Flash, Redirect}, + response::{Flash, Redirect, content::RawHtml}, }; use std::ops::Range; @@ -38,9 +36,12 @@ fn option_len<'v>(value: &Option<String>, range: Range<usize>) -> form::Result<' } #[get("/account/settings")] -pub fn r_account_settings(ri: RequestInfo) -> MyResult<UiResponse> { +pub fn r_account_settings(ri: RequestInfo) -> MyResult<RawHtml<String>> { let user = ri.require_user()?; - Ok(ri.respond_ui(OBB::new().with(VIEW_USER_SETTINGS, user))) + Ok(ri.respond_ui(&UserSettings { + ri: &ri.render_info(), + user, + })) } #[post("/account/settings", data = "<form>")] |