From b6416e86c9c58b8e886c14de55b01aeb863b8676 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Thu, 2 Jul 2026 00:12:02 +0200
Subject: Clean up events views: return_to, subnav, remove custom_rrule

- events_controller: wire return_to through show and new actions;
  create respects return_to with fallback to node/event path;
  new pre-populates node_id and tag_list from params
- events/edit: remove custom_rrule checkbox; node link removed from
  subnav (use show for node navigation); destroy button added
- events/new: remove custom_rrule checkbox; add return_to hidden
  field and back link; tag_list field added
- events/show: fix back link via safe_return_to; add node link to
  subnav; add destroy button; remove custom_rrule display; show
  humanized rrule below raw string
- events/index: destructive class on destroy button; node_id column
  replaced with node link; show/edit links carry return_to
- nodes/show: add show/edit links to event entries with return_to
---
 app/views/events/index.html.erb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'app/views/events/index.html.erb')

diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 064fa860..d0458d71 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -3,7 +3,6 @@
 <table>
   <tr>
     <th>Title</th>
-    <th>Is primary</th>
     <th>Start time</th>
     <th>End time</th>
     <th>Rrule</th>
@@ -16,17 +15,16 @@
 <% @events.each do |event| %>
   <tr>
     <td><%=h event.display_title %></td>
-    <td><%=h event.is_primary %></td>
     <td><%=h event.start_time %></td>
     <td><%=h event.end_time %></td>
     <td><%=h event.rrule %></td>
     <td><%=h event.custom_rrule %></td>
     <td><%=h event.allday %></td>
     <td><%=h event.url %></td>
-    <td><%=h event.node_id %></td>
-    <td><%= link_to 'Show', event %></td>
-    <td><%= link_to 'Edit', edit_event_path(event) %></td>
-    <td><%= button_to 'Destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
+    <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
+    <td><%= link_to 'show', event %></td>
+    <td><%= link_to 'edit', edit_event_path(event) %></td>
+    <td><%= button_to 'destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } %></td>
   </tr>
 <% end %>
 </table>
-- 
cgit v1.3