diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/routes/admin/import.rs | 14 | ||||
| -rw-r--r-- | server/src/routes/node.rs | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/server/src/routes/admin/import.rs b/server/src/routes/admin/import.rs index 31e7d70..f58901a 100644 --- a/server/src/routes/admin/import.rs +++ b/server/src/routes/admin/import.rs @@ -10,10 +10,10 @@ use jellyimport::{ ImportConfig, import_wrap, is_importing, reporting::{IMPORT_ERRORS, IMPORT_PROGRESS}, }; -use jellyui::{components::admin::AdminImport, tr}; +use jellyui::components::admin::AdminImport; use rocket::{ get, post, - response::{Flash, Redirect, content::RawHtml}, + response::{Redirect, content::RawHtml}, }; use rocket_ws::{Message, Stream, WebSocket}; use std::time::Duration; @@ -37,10 +37,7 @@ pub async fn r_admin_import(ri: RequestInfo<'_>) -> MyResult<RawHtml<String>> { } #[post("/admin/import?<incremental>")] -pub async fn r_admin_import_post( - ri: RequestInfo<'_>, - incremental: bool, -) -> MyResult<Flash<Redirect>> { +pub async fn r_admin_import_post(ri: RequestInfo<'_>, incremental: bool) -> MyResult<Redirect> { ri.require_admin()?; spawn(async move { let _ = import_wrap( @@ -53,10 +50,7 @@ pub async fn r_admin_import_post( ) .await; }); - Ok(Flash::success( - Redirect::to(u_admin_import()), - tr(ri.lang, "admin.import_success"), - )) + Ok(Redirect::to(u_admin_import())) } #[get("/admin/import", rank = 1)] diff --git a/server/src/routes/node.rs b/server/src/routes/node.rs index d8d9ba5..506d771 100644 --- a/server/src/routes/node.rs +++ b/server/src/routes/node.rs @@ -30,10 +30,10 @@ pub fn r_node(ri: RequestInfo<'_>, slug: &str) -> MyResult<RawHtml<String>> { ..Default::default() })? { let n = txn.get(row)?.unwrap(); + nku = Some(create_nku(txn, row)?); children = c_children(txn, row, &n)?; credits = c_credits(txn, &n)?; credited = c_credited(txn, row)?; - nku = Some(create_nku(txn, row)?); } Ok(()) })?; |