Merge branch 'allow-reservation-edits' into staging

# Conflicts: # src/tera/boatreservation.rs
2024-04-23 23:04:46 +02:00
parent d9885f9bba f1ee266288
commit be24001b4b
22 changed files with 263 additions and 146 deletions
--- a/src/tera/boatreservation.rs
+++ b/src/tera/boatreservation.rs
@@ -75,7 +75,7 @@ async fn index(
    context.insert("user", &User::all(db).await);
    context.insert(
        "loggedin_user",
-        &UserWithRoles::from_user(user.into(), db).await,
+        &UserWithRolesAndNotificationCount::from_user(user.into(), db).await,
    );

    Template::render("boatreservations", context.into_json())