agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Simplified setup to get or create @event

Browse Source
This commit is contained in:
echarp 2020-01-04 12:32:22 +01:00
parent 7ae853db76
commit 25f7f1cc0c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/events_controller.rb
View File

@ -6,8 +6,8 @@ class EventsController < ApplicationController
has_scope :future, type: :boolean, default: true, only: [:index], if: :future? has_scope :future, type: :boolean, default: true, only: [:index], if: :future?
before_action :set_events, only: :index before_action :set_events, only: :index
before_action :set_event, except: %i[index new preview_create create] before_action :new_event, unless: -> { params[:id].present? }
before_action :set_create_event, only: %i[new preview_create create] before_action :set_event, if: -> { params[:id].present? }
before_action :check_secret, only: %i[edit preview update destroy] before_action :check_secret, only: %i[edit preview update destroy]
rescue_from ActiveRecord::StaleObjectError, with: :locked rescue_from ActiveRecord::StaleObjectError, with: :locked
@ -89,12 +89,7 @@ class EventsController < ApplicationController
@events = @events.includes :region if params[:format].present? @events = @events.includes :region if params[:format].present?
end end
# Use callbacks to share common setup or constraints between actions def new_event
def set_event
@event = Event.find params[:id]
end
def set_create_event
time = Time.zone.now.change(min: 0) + 1.day time = Time.zone.now.change(min: 0) + 1.day
params[:event] ||= { params[:event] ||= {
start_time: time, start_time: time,
@ -104,6 +99,11 @@ class EventsController < ApplicationController
@event = Event.new event_params @event = Event.new event_params
end end
# Use callbacks to share common setup or constraints between actions
def set_event
@event = Event.find params[:id]
end
# Never trust parameters from the scary internet, only allow the white list # Never trust parameters from the scary internet, only allow the white list
# through # through
def event_params def event_params