From 51629c5c42270a346885057a441095c964101cc1 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Tue, 30 Jun 2026 03:55:42 +0200
Subject: Fix events CRUD for standalone events and add events to admin menu

- event_params now permits title, description, is_primary
- event_information helper lists all node.events, not just the first
- Occurrence.generate handles nil node (standalone events)
- Page.aggregate order_by title uses correlated subquery to avoid
  GROUP BY conflict with tag-filter path; order_direction whitelisted
  to ASC/DESC to prevent SQL injection
- Events link added to admin menu bar
- events/index shows title, is_primary; drops latitude/longitude columns
---
 app/views/admin/_menu.html.erb  | 1 +
 app/views/events/index.html.erb | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 6dba085b..c87c5f70 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -4,5 +4,6 @@
 <a href="#" onclick="admin_search.display_toggle(); return false;">search</a>
 <%= link_to 'Nodes', nodes_path, selected?('nodes') %>
 <%= link_to 'Assets', assets_path, selected?('assets') %>
+<%= link_to 'Events', events_path, selected?('events') %>
 <%= link_to 'User', users_path, selected?('users') %>
 <%= link_to 'Navigation', menu_items_path, selected?('menu_items') %> &gt;&nbsp;
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 19b21ce8..064fa860 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -2,27 +2,27 @@
 
 <table>
   <tr>
+    <th>Title</th>
+    <th>Is primary</th>
     <th>Start time</th>
     <th>End time</th>
     <th>Rrule</th>
     <th>Custom rrule</th>
     <th>Allday</th>
     <th>Url</th>
-    <th>Latitude</th>
-    <th>Longitude</th>
     <th>Node</th>
   </tr>
 
 <% @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.latitude %></td>
-    <td><%=h event.longitude %></td>
     <td><%=h event.node_id %></td>
     <td><%= link_to 'Show', event %></td>
     <td><%= link_to 'Edit', edit_event_path(event) %></td>
-- 
cgit v1.3