gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-16 21:24:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into recaptcha

Browse source
This commit is contained in:
James Mason 2017-11-15 11:58:15 -08:00 • committed by GitHub
commit eca09dd7d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 73 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/cfps_controller.rb
View file

@ -55,7 +55,7 @@ module Admin
private
def cfp_params
params.require(:cfp).permit(:start_date, :end_date, :cfp_type)
params.require(:cfp).permit(:start_date, :end_date, :description, :cfp_type)
end
end
end

1
app/controllers/admin/conferences_controller.rb
View file

@ -193,6 +193,7 @@ module Admin
def edit
@conferences = Conference.all
@date_string = date_string(@conference.start_date, @conference.end_date)
@affected_event_count = @conference.program.events.scheduled(@conference.program.selected_schedule_id).count
respond_to do |format|
format.html
format.json { render json: @conference.to_json }