diff options
Diffstat (limited to 'server/src/ui/items.rs')
| -rw-r--r-- | server/src/ui/items.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/src/ui/items.rs b/server/src/ui/items.rs index 915963c..ace948f 100644 --- a/server/src/ui/items.rs +++ b/server/src/ui/items.rs @@ -4,8 +4,8 @@ Copyright (C) 2025 metamuffin <metamuffin.org> */ use super::error::MyError; -use crate::helper::{accept::Accept, RequestInfo, A}; -use jellycommon::api::{ApiItemsResponse, NodeFilterSort}; +use crate::helper::{accept::Accept, filter_sort::ANodeFilterSort, RequestInfo}; +use jellycommon::api::ApiItemsResponse; use jellylogic::items::all_items; use jellyui::{items::ItemsPage, render_page}; use rocket::{get, response::content::RawHtml, serde::json::Json, Either}; @@ -14,9 +14,9 @@ use rocket::{get, response::content::RawHtml, serde::json::Json, Either}; pub fn r_items( ri: RequestInfo, page: Option<usize>, - filter: A<NodeFilterSort>, + filter: ANodeFilterSort, ) -> Result<Either<RawHtml<String>, Json<ApiItemsResponse>>, MyError> { - let r = all_items(&ri.session, page, filter.0.clone())?; + let r = all_items(&ri.session, page, filter.clone().into())?; Ok(if matches!(ri.accept, Accept::Json) { Either::Right(Json(r)) } else { @@ -24,7 +24,7 @@ pub fn r_items( &ItemsPage { lang: &ri.lang, r, - filter: &filter.0, + filter: &filter.clone().into(), page: page.unwrap_or(0), }, ri.render_info(), |