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

adds filtering of spending proposals by admin

Browse Source
This commit is contained in:
rgarcia
2016-03-01 19:58:13 +01:00
parent b38558f2f3
commit ec25b388c7
7 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/admin/spending_proposals_controller.rb
View File

@@ -7,7 +7,7 @@ class Admin::SpendingProposalsController < Admin::BaseController
load_and_authorize_resource
def index
@spending_proposals = geozone_filter(params[:geozone_id].presence).includes(:geozone, administrator: :user, valuators: :user).send(@current_filter).order(created_at: :desc).page(params[:page])
@spending_proposals = SpendingProposal.search(params, @current_filter).order(created_at: :desc).page(params[:page])
end
def show
@@ -26,17 +26,5 @@ class Admin::SpendingProposalsController < Admin::BaseController
@spending_proposal.update(params.require(:spending_proposal).permit(valuator_ids: []))
end
private
def geozone_filter(geozone)
case geozone
when nil
@spending_proposals
when 'all'
@spending_proposals.where(geozone_id: nil)
else
@spending_proposals.where(geozone_id: params[:geozone_id].presence)
end
end
end