1 files changed, 9 insertions, 11 deletions

diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index d88d12a..4293628 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -30,19 +30,17 @@ module NodesHelper
   end
 
   def event_information
-    if @node.events.first
-      event = @node.events.first
+    events = @node.events.order(:start_time)
+    items = events.map do |event|
       safe_join([
-        "#{event.start_time.to_fs(:db)} - #{event.end_time.to_fs(:db)} > ",
-        link_to('show', event_path(event)),
-        ' > ',
-        link_to('edit', edit_event_path(event))
-      ])
-    else
-      safe_join([
-        'no event attached > ',
-        link_to('add', new_event_path(:node_id => @node.id))
+        "#{event.start_time&.to_fs(:db)} - #{event.end_time&.to_fs(:db)} > ",
+        link_to('edit', edit_event_path(event)),
       ])
     end
+    safe_join([
+      safe_join(items, ' | '),
+      ' > ',
+      link_to('add event', new_event_path(:node_id => @node.id))
+    ])
   end
 end