From ae6d70b1c193c2d1e6c9110fff96b7ff423911fb Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 13 Jan 2016 16:32:10 +0100 Subject: [PATCH] Uses Abilities instead of exceptions in the proposals controller --- app/controllers/admin/spending_proposals_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb index 03fffeca7..9516ea76d 100644 --- a/app/controllers/admin/spending_proposals_controller.rb +++ b/app/controllers/admin/spending_proposals_controller.rb @@ -1,14 +1,14 @@ class Admin::SpendingProposalsController < Admin::BaseController has_filters %w{unresolved accepted rejected}, only: :index - load_and_authorize_resource except: [:index, :show] + load_and_authorize_resource def index - @spending_proposals = SpendingProposal.includes([:geozone]).send(@current_filter).order(created_at: :desc).page(params[:page]) + @spending_proposals = @spending_proposals.includes([:geozone]).send(@current_filter).order(created_at: :desc).page(params[:page]) end def show - @spending_proposal = SpendingProposal.includes([:author, :geozone]).find(params[:id]) + @spending_proposal = @spending_proposal.includes([:author, :geozone]) end def accept @@ -21,4 +21,4 @@ class Admin::SpendingProposalsController < Admin::BaseController redirect_to request.query_parameters.merge(action: :index) end -end \ No newline at end of file +end