Merge pull request 'allow-vorstand-to-send-things' (#600) from allow-vorstand-to-send-things into staging

Reviewed-on: #600

src/tera/admin/mail.rs

@@ -16,7 +16,7 @@ use crate::tera::Config;
 #[get("/mail")]
 async fn index(
     db: &State<SqlitePool>,
-    admin: AdminUser,
+    admin: VorstandUser,
     flash: Option<FlashMessage<'_>>,
 ) -> Template {
     let mut context = Context::new();
@@ -65,7 +65,7 @@ async fn update(
     db: &State<SqlitePool>,
     data: Form<MailToSend<'_>>,
     config: &State<Config>,
-    admin: AdminUser,
+    admin: VorstandUser,
 ) -> Flash<Redirect> {
     let d = data.into_inner();
     Log::create(db, format!("{admin:?} trying to send this mail: {d:?}")).await;

src/tera/admin/notification.rs

@@ -2,7 +2,7 @@ use crate::model::{
     log::Log,
     notification::Notification,
     role::Role,
-    user::{AdminUser, User, UserWithDetails},
+    user::{AdminUser, User, UserWithDetails, VorstandUser},
 };
 use itertools::Itertools;
 use rocket::{
@@ -18,7 +18,7 @@ use sqlx::SqlitePool;
 #[get("/notification")]
 async fn index(
     db: &State<SqlitePool>,
-    user: AdminUser,
+    user: VorstandUser,
     flash: Option<FlashMessage<'_>>,
 ) -> Template {
     let mut context = Context::new();
@@ -62,7 +62,7 @@ pub struct NotificationToSendUser {
 async fn send_group(
     db: &State<SqlitePool>,
     data: Form<NotificationToSendGroup>,
-    admin: AdminUser,
+    admin: VorstandUser,
 ) -> Flash<Redirect> {
     let d = data.into_inner();
     Log::create(
@@ -89,7 +89,7 @@ async fn send_group(
 async fn send_user(
     db: &State<SqlitePool>,
     data: Form<NotificationToSendUser>,
-    admin: AdminUser,
+    admin: VorstandUser,
 ) -> Flash<Redirect> {
     let d = data.into_inner();
     Log::create(

templates/index.html.tera

@@ -155,6 +155,13 @@
                             <a href="/board/boathouse"
                                class="block w-100 py-2 hover:text-primary-600">Bootshaus</a>
                         </li>
+                        <li class="py-1">
+                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail ausschicken</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/notification"
+                               class="block w-100 py-2 hover:text-primary-600">Nachricht ausschreiben</a>
+                        </li>
                     </ul>
                 </div>
             {% endif %}
@@ -169,19 +176,12 @@
                         <li class="py-1">
                             <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
                         </li>
-                        <li class="py-1">
-                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail</a>
-                        </li>
                         <li class="py-1">
                             <a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>
                         </li>
                         <li class="py-1">
                             <a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
                         </li>
-                        <li class="py-1">
-                            <a href="/admin/notification"
-                               class="block w-100 py-2 hover:text-primary-600">Nachricht ausschreiben</a>
-                        </li>
                     </ul>
                 </div>
             {% endif %}