Group created with id: {r}
"), + Ok(r) => format!("Group created with id: {r}"), Err(e) if e.to_string().contains("dup key") => { return Ok(HttpResponse::BadRequest() .append_header(( HTMX_ERROR_RES, - format!("Group '{}' already exists
", gf.name), + format!("Group '{}' already exists", gf.name), )) .finish()); } @@ -219,7 +246,7 @@ async fn system_create_group( // .delete(doc! {"name": &group.name}, GROUP, PhantomData::Group '{}' has been deleted
", group.name); +// let content = format!("Group '{}' has been deleted", group.name); // Ok(HttpResponse::Ok() // .content_type(ContentType::form_url_encoded()) // .body(content)) @@ -256,14 +283,14 @@ async fn system_update_group( return Ok(HttpResponse::BadRequest() .append_header(( HTMX_ERROR_RES, - format!("Group '{}' does not exist
", gf.name), + format!("Group '{}' does not exist", gf.name), )) .finish()); } Ok(HttpResponse::Ok() .content_type(ContentType::form_url_encoded()) - .body(format!("Group '{}' has been updated
", gf.name))) + .body(format!("Group '{}' has been updated", gf.name))) } #[patch("user")] @@ -279,7 +306,7 @@ async fn system_update_user( // stop self update if uf.email.eq(&uf.last_updated_by) { return Ok(HttpResponse::BadRequest() - .append_header((HTMX_ERROR_RES, "Cannot update self
".to_string())) + .append_header((HTMX_ERROR_RES, "Cannot update self".to_string())) .finish()); } @@ -300,7 +327,7 @@ async fn system_update_user( return Ok(HttpResponse::BadRequest() .append_header(( HTMX_ERROR_RES, - format!("User with email address {} does not exist
", uf.email), + format!("User '{}' does not exist", uf.email), )) .finish()); } @@ -308,7 +335,7 @@ async fn system_update_user( Ok(HttpResponse::Ok() .content_type(ContentType::form_url_encoded()) .body(format!( - "User with email address {} has been updated
", + "User '{}' has been updated", uf.email ))) } @@ -329,7 +356,7 @@ async fn system_delete_user( // stop self delete if uf.email.eq(&uf.last_updated_by) { return Ok(HttpResponse::BadRequest() - .append_header((HTMX_ERROR_RES, "Cannot delete self
".to_string())) + .append_header((HTMX_ERROR_RES, "Cannot delete self".to_string())) .finish()); } @@ -374,7 +401,6 @@ async fn system_tab_htmx( | AdminTab::GroupCreate | AdminTab::GroupView => { let mut group_form = GroupContent::new(); - CATALOG.get_all_by_name().iter().for_each(|name| { // TODO: remove this clone and use &'static str group_form.add(name.clone()); @@ -403,7 +429,7 @@ async fn system_tab_htmx( let groups: Vec