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

adds order to search results

Browse Source
This commit is contained in:
Juanjo Bazán
2016-12-27 12:38:46 +01:00
parent ee8c057a46
commit 283a474135
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admin/poll/polls_controller.rb
View File

@@ -6,7 +6,7 @@ class Admin::Poll::PollsController < Admin::BaseController
end
def show
@poll = Poll.includes(:questions, :booths, :officers).find(params[:id])
@poll = Poll.includes(:questions, :booths, officers: [:user]).order('poll_questions.title', 'poll_booths.name', 'users.username').find(params[:id])
end
def new
@@ -63,14 +63,14 @@ class Admin::Poll::PollsController < Admin::BaseController
end
def search_questions
@questions = ::Poll::Question.where("poll_id IS ? OR poll_id != ?", nil, @poll.id).search({search: @search})
@questions = ::Poll::Question.where("poll_id IS ? OR poll_id != ?", nil, @poll.id).search({search: @search}).order(title: :asc)
respond_to do |format|
format.js
end
end
def search_officers
@officers = User.joins(:poll_officer).search(@search)
@officers = User.joins(:poll_officer).search(@search).order(username: :asc)
respond_to do |format|
format.js