Merge pull request 'allow admins to delete logbook entries' (#666) from allow-admin-to-delete-logbook-entries into main

Reviewed-on: #666

fd

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-scp read@128.140.64.118:/home/rowing/db.sqlite db.sqlite
+scp root@128.140.64.118:/home/rowing/db.sqlite db.sqlite
 #sqlite3 db.sqlite < seeds.sql
 

src/model/logbook.rs

@@ -699,6 +699,7 @@ ORDER BY departure DESC
     pub async fn delete(&self, db: &SqlitePool, user: &User) -> Result<(), LogbookDeleteError> {
         Log::create(db, format!("{} deleted trip: {self:?}", user.name)).await;
 
+        if self.arrival.is_none() {
             if user.has_role(db, "admin").await
                 || user.has_role(db, "Vorstand").await
                 || user.id == self.shipmaster
@@ -740,6 +741,16 @@ ORDER BY departure DESC
                     .unwrap(); //Okay, because we can only create a Logbook of a valid id
                 return Ok(());
             }
+        } else {
+            // Only admins can delete completed logbook entries
+            if user.has_role(db, "admin").await {
+                sqlx::query!("DELETE FROM logbook WHERE id=?", self.id)
+                    .execute(db)
+                    .await
+                    .unwrap(); //Okay, because we can only create a Logbook of a valid id
+                return Ok(());
+            }
+        }
         Err(LogbookDeleteError::NotYourEntry)
     }
 }

src/tera/log.rs

@@ -400,6 +400,11 @@ async fn home(
 async fn delete(db: &State<SqlitePool>, logbook_id: i64, user: DonauLinzUser) -> Flash<Redirect> {
     let logbook = Logbook::find_by_id(db, logbook_id).await;
     if let Some(logbook) = logbook {
+        let redirect = if logbook.arrival.is_some() {
+            "/log/show"
+        } else {
+            "/log"
+        };
         Log::create(
             db,
             format!("User {} tries to delete log entry {logbook_id}", &user.name),
@@ -407,11 +412,11 @@ async fn delete(db: &State<SqlitePool>, logbook_id: i64, user: DonauLinzUser) ->
         .await;
         match logbook.delete(db, &user).await {
             Ok(_) => Flash::success(
-                Redirect::to("/log"),
+                Redirect::to(redirect),
-                format!("Eintrag {} gelöscht!", logbook_id),
+                format!("Eintrag {} von {} gelöscht!", logbook_id, user.name),
             ),
             Err(LogbookDeleteError::NotYourEntry) => Flash::error(
-                Redirect::to("/log"),
+                Redirect::to(redirect),
                 "Du hast nicht die Berechtigung, den Eintrag zu löschen!",
             ),
         }

templates/includes/forms/log.html.tera

@@ -262,6 +262,12 @@
                         <input type="hidden" name="logtype" value="{{ log.logtype }}" />
                         <input type="submit" value="Updaten" />
                     </form>
+                                <a href="/log/{{ log.id }}/delete"
+                                   class="w-28 btn btn-alert"
+                                   onclick="return confirm('Willst du diesen Logbucheintrag wirklich löschen?');">
+                                    {% include "includes/delete-icon" %}
+                                    Löschen
+                                </a>
                 {% endif %}
             </details>
         </div>