consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/shift_creation_polls

Browse Source
This commit is contained in:
Bertocq
2017-10-04 15:27:54 +02:00
parent 2900104a07 9ab22870cc
commit e1a7fc5dfa
47 changed files with 304 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/poll/questions_controller.rb
View File

@@ -56,7 +56,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController
private
def question_params
params.require(:poll_question).permit(:poll_id, :title, :question, :description, :proposal_id, :valid_answers, :video_url,
params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url,
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
end

2
app/controllers/admin/poll/shifts_controller.rb
View File

@@ -29,7 +29,7 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController
end
def search_officers
@officers = User.search(params[:search]).order(username: :asc)
@officers = User.search(params[:search]).order(username: :asc).select { |o| o.poll_officer? == true }
end
private