Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop batch-add form being overwritten

Browse source
This commit is contained in:
Joscha 2023-08-17 19:23:04 +02:00
parent fa9cf9d1c5
commit 4478981946
3 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/server/web/pages/queue.rs
View file

@ -155,7 +155,6 @@ async fn get_queue_data(
#[derive(Template)]
#[template(path = "pages/queue_inner.html")]
struct PageInner {
link_admin_queue_add_batch: Link,
workers: Vec<Worker>,
tasks: Vec<Task>,
}
@ -168,17 +167,16 @@ pub async fn get_queue_inner(
) -> somehow::Result<impl IntoResponse> {
let base = Base::new(config, Tab::Queue);
let sorted_workers = sorted_workers(&workers);
Ok(PageInner {
link_admin_queue_add_batch: base.link(PathAdminQueueAddBatch {}),
workers: get_workers(&db, &sorted_workers, &base).await?,
tasks: get_queue_data(&db, &sorted_workers, &base).await?,
})
let workers = get_workers(&db, &sorted_workers, &base).await?;
let tasks = get_queue_data(&db, &sorted_workers, &base).await?;
Ok(PageInner { workers, tasks })
}
#[derive(Template)]
#[template(path = "pages/queue.html")]
struct Page {
link_queue_js: Link,
link_admin_queue_add_batch: Link,
base: Base,
inner: PageInner,
}
@ -191,14 +189,13 @@ pub async fn get_queue(
) -> somehow::Result<impl IntoResponse> {
let base = Base::new(config, Tab::Queue);
let sorted_workers = sorted_workers(&workers);
let workers = get_workers(&db, &sorted_workers, &base).await?;
let tasks = get_queue_data(&db, &sorted_workers, &base).await?;
Ok(Page {
link_queue_js: base.link(QUEUE_JS),
inner: PageInner {
link_admin_queue_add_batch: base.link(PathAdminQueueAddBatch {}),
workers: get_workers(&db, &sorted_workers, &base).await?,
tasks: get_queue_data(&db, &sorted_workers, &base).await?,
},
link_admin_queue_add_batch: base.link(PathAdminQueueAddBatch {}),
base,
inner: PageInner { workers, tasks },
})
}