From b6416e86c9c58b8e886c14de55b01aeb863b8676 Mon Sep 17 00:00:00 2001
From: erdgeist
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/edit.html.erb | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
(limited to 'app/views/events/edit.html.erb')
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 17457df4..5aee5019 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -1,9 +1,6 @@
<% content_for :subnavigation do %>
<%= link_to 'back', safe_return_to(params[:return_to] || events_path) %>
- <% if @event.node %>
- <%= link_to 'node', edit_node_path(@event.node) %>
- <% end %>
- <%= link_to 'show', @event %>
+ <%= button_to 'destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
<% end %>
Editing event
@@ -25,8 +22,8 @@
<%= f.text_field :rrule %>
- <%= f.label :custom_rrule %>
- <%= f.check_box :custom_rrule %>
+ <%= f.label :tag_list, "Tags" %>
+ <%= f.text_field :tag_list %>
<%= f.label :allday %>
--
cgit v1.3