From 9b5bc5c4da86bc2ef343510b44cfbaa11868d380 Mon Sep 17 00:00:00 2001 From: manuel Date: Sat, 4 Jun 2022 16:34:16 +0200 Subject: [PATCH] add htmx for delete --- actix_admin/src/builder.rs | 2 +- actix_admin/src/routes/delete_post.rs | 9 +++------ actix_admin/templates/base.html | 1 + actix_admin/templates/list.html | 9 ++------- database.db-wal | Bin 148352 -> 206032 bytes 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/actix_admin/src/builder.rs b/actix_admin/src/builder.rs index acedae2..f933455 100644 --- a/actix_admin/src/builder.rs +++ b/actix_admin/src/builder.rs @@ -42,7 +42,7 @@ impl ActixAdminBuilderTrait for ActixAdminBuilder { .route("/create", web::post().to(create_post::)) .route("/edit/{id}", web::get().to(edit_get::)) .route("/edit/{id}", web::post().to(edit_post::)) - .route("/delete/{id}", web::post().to(delete_post::)), + .route("/delete/{id}", web::post().to(delete_post::)) ); self.actix_admin.entity_names.push(E::get_entity_name()); diff --git a/actix_admin/src/routes/delete_post.rs b/actix_admin/src/routes/delete_post.rs index 4fb2305..d61b246 100644 --- a/actix_admin/src/routes/delete_post.rs +++ b/actix_admin/src/routes/delete_post.rs @@ -12,14 +12,11 @@ pub async fn delete_post let db = &data.get_db(); let entity_name = E::get_entity_name(); let actix_admin = data.get_actix_admin(); - let view_model = actix_admin.view_models.get(&entity_name).unwrap(); + //let view_model = actix_admin.view_models.get(&entity_name).unwrap(); + // TODO:handle any errors let _result = E::delete_entity(db, id.into_inner()).await; - Ok(HttpResponse::Found() - .append_header(( - header::LOCATION, - format!("/admin/{}/list", view_model.entity_name), - )) + Ok(HttpResponse::Ok() .finish()) } \ No newline at end of file diff --git a/actix_admin/templates/base.html b/actix_admin/templates/base.html index 0192338..e4d421d 100644 --- a/actix_admin/templates/base.html +++ b/actix_admin/templates/base.html @@ -6,6 +6,7 @@ Actix Admin + diff --git a/actix_admin/templates/list.html b/actix_admin/templates/list.html index b0ff559..a1312dd 100644 --- a/actix_admin/templates/list.html +++ b/actix_admin/templates/list.html @@ -14,7 +14,7 @@ - + {% for entity in entities -%} {% for model_field in view_model.fields -%} @@ -22,12 +22,7 @@ {%- endfor %} ✎ - 🗑 - + 🗑 {%- endfor %} diff --git a/database.db-wal b/database.db-wal index fe616b166c8f402a082f69d30e3622cc10708c21..6cdae979a56cfa770f99f136208b06f0cc9b0d45 100644 GIT binary patch delta 1434 zcmZo@=e%%|r=f*$3sZyh^aYHJ0y5X8-JF#tUzodFfBG*YCR-K;1_q(&t1mGcXfgqrEMLvvtiNv{_02y??XlbWTXG=XEFj%*y(qf* zKSOjYSOPWk3X2*V8G{gzgJN18*T*S_LC^PqOk)O_26YFfTMR*NAz<2*^LKPQ=U08< z<=@4?1TqcmCy-f4ZqtwiI>Jp_HnBJ*JtZv#NTnnfr=$S|iLt_KCsTX+Ztb2TsWK z6o-+dWJ+pcabikwiXb-&gQRpNI7lI(okqyf3G8*xv^XTEeuKE0dwLfm(A5D^m+HGh z7$))p!;=x@>bvxHH88LQ(1IEzOG-;Cy}wrMnK2ih^l0foplg)Tf)$4Y;faz<`fFzS zkN<1xA*u2$1OHnZh9J5F1$kH)q$Qy#0DEG6!Y