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

Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers

Browse source 
Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
This commit is contained in:
Henne Vogelsang 2014-03-03 10:52:24 +01:00
commit 14a896842b
31 changed files with 342 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/admin/volunteers_controller.rb Normal file
View file

@ -0,0 +1,23 @@
class Admin::VolunteersController < ApplicationController
def index
@conference = Conference.find_all_by_short_title(params[:conference_id]).first
render :index
end
def show
@conference = Conference.find_all_by_short_title(params[:conference_id]).first
@volunteers = @conference.registrations.joins(:vchoices).all
end
def update
@conference = Conference.find_all_by_short_title(params[:conference_id]).first
# @conference.update_attributes(params[:conference])
# redirect_to admin_conference_volunteers_path(@conference.short_title)
begin
@conference.update_attributes!(params[:conference])
redirect_to(admin_conference_volunteer_options_path(:conference_id => params[:conference_id]), :notice => "Volunteering options were successfully updated.")
rescue Exception => e
redirect_to(admin_conference_volunteer_options_path(:conference_id => params[:conference_id]), :alert => "Volunteering options update failed: #{e.message}")
end
end
end