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/new.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index cd892c5d..4e1ef53e 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -16,8 +16,8 @@
     <%= f.text_field :rrule %>
   </p>
   <p>
-    <%= f.label :custom_rrule %><br />
-    <%= f.check_box :custom_rrule %>
+    <%= f.label :tag_list, "Tags" %><br />
+    <%= f.text_field :tag_list %>
   </p>
   <p>
     <%= f.label :allday %><br />
@@ -37,10 +37,11 @@
   </p>
   <p>
     <%= f.hidden_field :node_id %>
+    <%= hidden_field_tag :return_to, params[:return_to] %>
   </p>
   <p>
     <%= f.submit 'Create' %>
   </p>
 <% end %>
 
-<%= link_to 'Back', events_path %>
+<%= link_to 'Back', safe_return_to(params[:return_to] || events_path) %>
-- 
cgit v1.3