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

Hotfix question display

Browse source 
what a mess....
This commit is contained in:
Henne Vogelsang 2016-05-25 14:40:45 +02:00
parent 5765dd1242
commit 3578953b1e
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ module Admin
def index
authorize! :index, Question.new(conference_id: @conference.id)
@questions = Question.where(global: true).all | Question.where(conference_id: @conference.id)
@questions = Question.where(global: true) | @conference.questions
@questions_conference = @conference.questions
@new_question = @conference.questions.new
end