diff options
Diffstat (limited to 'server/src/ui/items.rs')
| -rw-r--r-- | server/src/ui/items.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server/src/ui/items.rs b/server/src/ui/items.rs index ed16c61..1ac2c09 100644 --- a/server/src/ui/items.rs +++ b/server/src/ui/items.rs @@ -7,18 +7,17 @@ use super::error::MyError; use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A}; use jellycommon::api::{ApiItemsResponse, NodeFilterSort}; use jellyimport::is_importing; -use jellylogic::{items::all_items, session::Session, Database}; +use jellylogic::{items::all_items, session::Session}; use jellyui::{ items::ItemsPage, render_page, scaffold::{RenderInfo, SessionInfo}, }; -use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State}; +use rocket::{get, response::content::RawHtml, serde::json::Json, Either}; #[get("/items?<page>&<filter..>")] pub fn r_items( session: A<Session>, - db: &State<Database>, aj: AcceptJson, page: Option<usize>, filter: A<NodeFilterSort>, @@ -26,7 +25,7 @@ pub fn r_items( ) -> Result<Either<RawHtml<String>, Json<ApiItemsResponse>>, MyError> { let AcceptLanguage(lang) = lang; - let r = all_items(db, &session.0, page, filter.0.clone())?; + let r = all_items(&session.0, page, filter.0.clone())?; Ok(if *aj { Either::Right(Json(r)) |