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

Merge pull request #1019 from consul/spending-proposals-index

Browse Source 
Spending proposals index
This commit is contained in:
Alberto García Cabeza
2016-03-29 17:16:07 +02:00
parent d97ebf4104 bd1c0dfa19
commit 16bf4137ee
11 changed files with 140 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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 = SpendingProposal.search(params, @current_filter).order(created_at: :desc).page(params[:page])
@spending_proposals = SpendingProposal.scoped_filter(params, @current_filter).order(created_at: :desc).page(params[:page])
end
def show

2
app/controllers/spending_proposals_controller.rb
View File

@@ -10,6 +10,8 @@ class SpendingProposalsController < ApplicationController
feature_flag :spending_proposals
def index
@spending_proposals = @search_terms.present? ? SpendingProposal.search(@search_terms) : SpendingProposal.all
@spending_proposals = @spending_proposals.page(params[:page]).for_render
end
def new

2
app/controllers/valuation/spending_proposals_controller.rb
View File

@@ -10,7 +10,7 @@ class Valuation::SpendingProposalsController < Valuation::BaseController
def index
if current_user.valuator?
@spending_proposals = SpendingProposal.search(params_for_current_valuator, @current_filter).order(created_at: :desc).page(params[:page])
@spending_proposals = SpendingProposal.scoped_filter(params_for_current_valuator, @current_filter).order(created_at: :desc).page(params[:page])
else
@spending_proposals = SpendingProposal.none.page(params[:page])
end