diff --git a/.gitignore b/.gitignore index e5d4f7df675497d13ab60c94c56a10908aff0420..e48e0937cc4f1ce8cb19155b29cf56b54de6d024 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ public/refinery/* # Vendor Cache vendor/cache +vendor/bundle # Acts as Indexed index/**/* diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 28ff837b06ff455413aa60128495ca6d5a41b5b2..10bd5d295e37e94653e68511b1f7326657048bbb 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -41,7 +41,7 @@ class EventsController < ApplicationController def create @event = Event.new(event_params) # This is a special case, required to handle the region attribute with same foreign key name - @event.region = Region.find(params[:event][:region]) + @event.region = Region.find params[:event][:region] if params[:visu] @event.valid? @@ -56,7 +56,7 @@ class EventsController < ApplicationController # Send a mail to moderators ModerationMailer.create(@event).deliver - format.html { redirect_to @event, notice: t('.ok') } + format.html { redirect_to :root, notice: t('.ok') } format.json { render action: 'show', status: :created, location: @event } else format.html { render action: 'new' } @@ -117,8 +117,8 @@ class EventsController < ApplicationController end def check_secret - if (params[:secret] != @event.secret) - redirect_to @event, notice: t(:forbidden, scope: [:events, :edit]) + if params[:secret] != @event.secret + redirect_to :root, notice: t(:forbidden, scope: [:events, :edit]) end end diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index e7134d31eb40c33e7bfb9316b0165081ef4ed6bb..8fba6d92fd58607887049ceea5e605a2e9a3ec41 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -1,4 +1,4 @@ -- if request.format == 'text/html' && controller.controller_name != 'moderations' && controller.controller_name != 'notes' && controller.action_name != 'edit' +- if request.format == 'text/html' && controller.controller_name != 'moderations' && controller.controller_name != 'notes' && controller.action_name != 'edit' && controller.action_name != 'cancel' #lug-list %h1=t '.lug-list' - if @event.region