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 #3422 from hennevogel/bugfix/3421

Browse source 
Do not require programs languages in controller
This commit is contained in:
Henne Vogelsang 2024-07-02 15:28:32 +02:00 • committed by GitHub
commit 4c1b7eba2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/events_controller.rb
View file

@ -57,7 +57,6 @@ module Admin
@comment_count = @event.comment_threads.count @comment_count = @event.comment_threads.count
@user = @event.submitter @user = @event.submitter
@url = admin_conference_program_event_path(@conference.short_title, @event) @url = admin_conference_program_event_path(@conference.short_title, @event)
@languages = @program.languages_list
end end
def comment def comment
@ -71,7 +70,6 @@ module Admin
end end
def update def update
@languages = @program.languages_list
if @event.update(event_params) if @event.update(event_params)
if request.xhr? if request.xhr?
@ -89,7 +87,6 @@ module Admin
def create def create
@url = admin_conference_program_events_path(@conference.short_title, @event) @url = admin_conference_program_events_path(@conference.short_title, @event)
@languages = @program.languages_list
@event.submitter = current_user @event.submitter = current_user
if @event.save if @event.save
@ -102,7 +99,6 @@ module Admin
def new def new
@url = admin_conference_program_events_path(@conference.short_title, @event) @url = admin_conference_program_events_path(@conference.short_title, @event)
@languages = @program.languages_list
end end
def accept def accept

2
app/controllers/proposals_controller.rb
View file

@ -23,12 +23,10 @@ class ProposalsController < ApplicationController
def new def new
@user = User.new @user = User.new
@url = conference_program_proposals_path(@conference.short_title) @url = conference_program_proposals_path(@conference.short_title)
@languages = @program.languages_list
end end
def edit def edit
@url = conference_program_proposal_path(@conference.short_title, params[:id]) @url = conference_program_proposal_path(@conference.short_title, params[:id])
@languages = @program.languages_list
end end
def create def create

2
app/views/proposals/_form.html.haml
View file

@ -32,7 +32,7 @@
- if @program.languages.present? - if @program.languages.present?
.form-group .form-group
= f.label :language = f.label :language
= f.select :language, @languages, { include_blank: false}, { class: 'select-help-toggle form-control' } = f.select :language, @program.languages_list, { include_blank: false}, { class: 'select-help-toggle form-control' }
= render 'shared/select_help_text', f: f, for: :event_type_id, options: @conference.program.event_types do |event_type| = render 'shared/select_help_text', f: f, for: :event_type_id, options: @conference.program.event_types do |event_type|
= event_type.description = event_type.description
- if display_details - if display_details