gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #905 from Ana06/languages

Browse source 
Languages
This commit is contained in:
Henne Vogelsang 2016-06-15 16:55:12 +02:00 • committed by GitHub
commit dcae196d2b
16 changed files with 115 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/proposal_controller.rb
View file

@ -20,10 +20,12 @@ class ProposalController < ApplicationController
def new
@user = User.new
@url = conference_program_proposal_index_path(@conference.short_title)
@languages = @program.languages_list
end
def edit
@url = conference_program_proposal_path(@conference.short_title, params[:id])
@languages = @program.languages_list
end
def create
@ -144,7 +146,7 @@ class ProposalController < ApplicationController
def event_params
params.require(:event).permit(:event_type_id, :track_id, :difficulty_level_id,
:title, :subtitle, :abstract, :description,
:require_registration, :max_attendees)
:require_registration, :max_attendees, :language)
end
def user_params