Merge pull request 'spacing again' (#269) from staging into main

Reviewed-on: #269

src/model/logbook.rs

@@ -472,7 +472,7 @@ ORDER BY departure DESC
         mut log: LogToFinalize,
     ) -> Result<(), LogbookUpdateError> {
         //TODO: extract common tests with `create()`
-        if user.id != self.shipmaster {
+        if !user.has_role_tx(db, "Vorstand").await && user.id != self.shipmaster {
             return Err(LogbookUpdateError::NotYourEntry);
         }
 
@@ -549,7 +549,10 @@ ORDER BY departure DESC
     pub async fn delete(&self, db: &SqlitePool, user: &User) -> Result<(), LogbookDeleteError> {
         Log::create(db, format!("{user:?} deleted trip: {self:?}")).await;
 
-        if user.has_role(db, "admin").await || user.id == self.shipmaster {
+        if user.has_role(db, "admin").await
+            || user.has_role(db, "Vorstand").await
+            || user.id == self.shipmaster
+        {
             sqlx::query!("DELETE FROM logbook WHERE id=?", self.id)
                 .execute(db)
                 .await

templates/includes/forms/log.html.tera

@@ -137,9 +137,11 @@
                                 {{ rower.name }}
                                 {% if rower.id == log.shipmaster or rower.id == log.steering_person %}
                                     <small class="text-gray-600 dark:text-primary-100">(
-                                        {%- if rower.id == log.shipmaster %}Schiffsführer{% endif -%}
+                                        {%- if rower.id == log.shipmaster %}Schiffsführer
-                                        {% if rower.id == log.shipmaster and rower.id == log.steering_person %} / {% endif %}
+                                        {% endif -%}
-                                        {%- if rower.id == log.steering_person %}Steuerperson{% endif -%}
+                                        {% if rower.id == log.shipmaster and rower.id == log.steering_person %}/{% endif %}
+                                        {%- if rower.id == log.steering_person %}Steuerperson
+                                        {% endif -%}
                                     )</small>
                                 {% endif %}
                             </p>

templates/log.html.tera

@@ -19,6 +19,8 @@
                     {% for log in on_water %}
                         {% if log.shipmaster == loggedin_user.id %}
                             {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
+                        {% elif "Vorstand" in loggedin_user.roles %}
+                            {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
                         {% else %}
                             {{ log::show(log=log, state="on_water", only_ones=true) }}
                         {% endif %}

templates/planned.html.tera

@@ -109,9 +109,9 @@
                                                     Uhr
                                                 </strong>
                                                 <small class="text-gray-600 dark:text-gray-100">({{ planned_event.name }}
-                                                    {% if planned_event.trip_type %}
+                                                    {%- if planned_event.trip_type %}
                                                         - {{ planned_event.trip_type.icon | safe }} {{ planned_event.trip_type.name }}
-                                                    {% endif %}
+                                                    {%- endif -%}
                                                 )</small>
                                                 <br />
                                                 <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>{{ planned_event.planned_starting_time }} Uhr</strong> ({{ planned_event.name }})