From d954b27737ff69d29cd22ad8966641aa33f05986 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Thu, 6 Mar 2025 12:07:44 +0900 Subject: [PATCH 1/2] Put index action at the top --- app/controllers/admin/events_controller.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index d9fb76002..c9be931d1 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -1,6 +1,10 @@ class Admin::EventsController < Admin::ApplicationController before_action :require_event, only: [:destroy, :archive, :unarchive] + def index + @events = Event.order(:archived, id: :desc) + end + def new @event = Event.new end @@ -39,9 +43,4 @@ def unarchive end redirect_to admin_events_path end - - def index - @events = Event.order(:archived, id: :desc) - end - end From 7cca5b9460a097af9f56185e3df99a35bea02d3a Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Thu, 6 Mar 2025 12:14:27 +0900 Subject: [PATCH 2/2] Show status rather than state at admin/events --- app/views/admin/events/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml index 55d17dae3..0b9f4dfbe 100644 --- a/app/views/admin/events/index.html.haml +++ b/app/views/admin/events/index.html.haml @@ -28,7 +28,7 @@ %tr %td= link_to event.name, event_staff_edit_path(event_slug: event.slug) %td= "#{event.start_date.to_fs(:month_day) unless event.start_date.blank?} - #{event.end_date.to_fs(:month_day_year) unless event.end_date.blank?}" - %td= event.state + %td= event.status %td= event.opens_at.to_fs(:long_with_zone) unless event.opens_at.blank? %td= event.closes_at.to_fs(:long_with_zone) unless event.closes_at.blank? - if event.current?