add notes
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
use crate::{
|
||||
model::{
|
||||
activity::Activity,
|
||||
family::Family,
|
||||
log::Log,
|
||||
logbook::Logbook,
|
||||
@ -128,6 +129,7 @@ async fn view(
|
||||
|
||||
let member = Member::from(db, user.clone()).await;
|
||||
let fee = user.fee(db).await;
|
||||
let activities = Activity::for_user(db, &user).await;
|
||||
|
||||
let user = UserWithRolesAndMembershipPdf::from_user(db, user).await;
|
||||
|
||||
@ -147,6 +149,7 @@ async fn view(
|
||||
context.insert("supposed_to_pay", &member.supposed_to_pay());
|
||||
context.insert("fee", &fee);
|
||||
context.insert("member", &member);
|
||||
context.insert("activities", &activities);
|
||||
context.insert("roles", &roles);
|
||||
context.insert("families", &families);
|
||||
context.insert(
|
||||
@ -332,7 +335,7 @@ pub struct AddNoteForm {
|
||||
note: String,
|
||||
}
|
||||
|
||||
#[post("/user/<id>/add-note", data = "<data>")]
|
||||
#[post("/user/<id>/new-note", data = "<data>")]
|
||||
async fn add_note(
|
||||
db: &State<SqlitePool>,
|
||||
data: Form<AddNoteForm>,
|
||||
@ -346,7 +349,7 @@ async fn add_note(
|
||||
);
|
||||
};
|
||||
|
||||
match user.add_note(db, &admin, &data.note).await {
|
||||
match user.add_note(db, &admin, &user, &data.note).await {
|
||||
Ok(_) => Flash::success(
|
||||
Redirect::to(format!("/admin/user/{}", user.id)),
|
||||
"Notiz hinzugefügt",
|
||||
|
Reference in New Issue
Block a user