gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'

Browse source
This commit is contained in:
richiethomas 2016-09-14 22:42:04 -04:00
parent 0b6550d060
commit daf1f805bd
71 changed files with 225 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/conference_controller.rb → app/controllers/admin/conferences_controller.rb
View file

@ -1,5 +1,5 @@
module Admin
class ConferenceController < Admin::BaseController
class ConferencesController < Admin::BaseController
load_and_authorize_resource :conference, find_by: :short_title
load_resource :program, through: :conference, singleton: true, except: :index
load_resource :user, only: [:remove_user]

2
app/controllers/application_controller.rb
View file

@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base
(!session[:return_to] ||
session[:return_to] &&
session[:return_to] == root_path)
admin_conference_index_path
admin_conferences_path
else
session[:return_to] || root_path
end

4
app/controllers/conference_controller.rb → app/controllers/conferences_controller.rb
View file

@ -1,6 +1,6 @@
class ConferenceController < ApplicationController
class ConferencesController < ApplicationController
protect_from_forgery with: :null_session
before_filter :respond_to_options
before_action :respond_to_options
load_and_authorize_resource find_by: :short_title
load_resource :program, through: :conference, singleton: true, except: :index

26
app/controllers/proposal_controller.rb → app/controllers/proposals_controller.rb
View file

@ -1,5 +1,5 @@
class ProposalController < ApplicationController
before_filter :authenticate_user!, except: [:show, :new, :create]
class ProposalsController < ApplicationController
before_action :authenticate_user!, except: [:show, :new, :create]
load_resource :conference, find_by: :short_title
load_resource :program, through: :conference, singleton: true
load_and_authorize_resource :event, parent: false, through: :program
@ -20,7 +20,7 @@ class ProposalController < ApplicationController
def new
@user = User.new
@url = conference_program_proposal_index_path(@conference.short_title)
@url = conference_program_proposals_path(@conference.short_title)
@languages = @program.languages_list
end
@ -30,7 +30,7 @@ class ProposalController < ApplicationController
end
def create
@url = conference_program_proposal_index_path(@conference.short_title)
@url = conference_program_proposals_path(@conference.short_title)
# We allow proposal submission and sign up on same page.
# If user is not signed in then first create new user and then sign them in
@ -55,7 +55,7 @@ class ProposalController < ApplicationController
event_role: 'speaker')
if @event.save
ahoy.track 'Event submission', title: 'New submission'
redirect_to conference_program_proposal_index_path(@conference.short_title), notice: 'Proposal was successfully submitted.'
redirect_to conference_program_proposals_path(@conference.short_title), notice: 'Proposal was successfully submitted.'
else
flash[:error] = "Could not submit proposal: #{@event.errors.full_messages.join(', ')}"
render action: 'new'
@ -66,7 +66,7 @@ class ProposalController < ApplicationController
@url = conference_program_proposal_path(@conference.short_title, params[:id])
if @event.update(event_params)
redirect_to conference_program_proposal_index_path(conference_id: @conference.short_title),
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
notice: 'Proposal was successfully updated.'
else
flash[:error] = "Could not update proposal: #{@event.errors.full_messages.join(', ')}"
@ -86,10 +86,10 @@ class ProposalController < ApplicationController
end
if @event.save
redirect_to conference_program_proposal_index_path(conference_id: @conference.short_title),
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
notice: 'Proposal was successfully withdrawn.'
else
redirect_to conference_program_proposal_index_path(conference_id: @conference.short_title),
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
error: "Could not withdraw proposal: #{@event.errors.full_messages.join(', ')}"
end
end
@ -107,14 +107,14 @@ class ProposalController < ApplicationController
if @event.save
if @conference.user_registered?(current_user)
redirect_to conference_program_proposal_index_path(@conference.short_title),
redirect_to conference_program_proposals_path(@conference.short_title),
notice: 'The proposal was confirmed.'
else
redirect_to new_conference_conference_registration_path(conference_id: @conference.short_title),
alert: 'The proposal was confirmed. Please register to attend the conference.'
end
else
redirect_to conference_program_proposal_index_path(conference_id: @conference.short_title),
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
error: "Could not confirm proposal: #{@event.errors.full_messages.join(', ')}"
end
end
@ -126,16 +126,16 @@ class ProposalController < ApplicationController
begin
@event.restart
rescue Transitions::InvalidTransition
redirect_to conference_program_proposal_index_path(conference_id: @conference.short_title),
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
error: "The proposal can't be re-submitted."
return
end
if @event.save
redirect_to conference_program_proposal_index_path(conference_id: @conference.short_title),
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
notice: "The proposal was re-submitted. The #{@conference.short_title} organizers will review it again."
else
redirect_to conference_program_proposal_index_path(conference_id: @conference.short_title),
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
error: "Could not re-submit proposal: #{@event.errors.full_messages.join(', ')}"
end
end