Merge commit 'b3b4f77'

# Conflicts: # themes/intotheeast/templates/partials/trip-feed-col.html.twig # themes/intotheeast/templates/trip.html.twig
2026-07-08 00:08:37 +02:00
parent d4fcbecaf1 b3b4f774d0
commit 1dc9c9854c
77 changed files with 3246 additions and 151 deletions
@@ -5,6 +5,10 @@
   caller only. Home's active-trip include omits it (`only`), so it defaults off
   and that header renders exactly as before (KTD4 / R12). #}
 {% set trip_header_extras = trip_header_extras|default(false) %}
+{# owner_can_edit gates the Draft badge + Edit/Delete controls on each card
+   (threaded into entry-journal below). Default false so any caller that doesn't
+   pass it renders a read-only feed. #}
+{% set owner_can_edit = owner_can_edit ?? false %}
 <div class="home-feed-col">
    <div class="home-trip-header">
        <h1 class="home-trip-name">{{ trip_page.title }}</h1>