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

adds valuators to spending proposals

Browse Source 
Conflicts:
	app/views/admin/spending_proposals/show.html.erb
This commit is contained in:
rgarcia
2016-03-07 18:57:20 +01:00
committed by kikito
parent 07b99bb017
commit 389b89970f
4 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,18 +11,15 @@ class Admin::SpendingProposalsController < Admin::BaseController
end
def show
@admins = Administrator.includes(:user).all
@valuators = Valuator.includes(:user).all.order("users.username ASC")
end
def edit
@spending_proposal = SpendingProposal.find(params[:id])
@admins = Administrator.includes(:user).all
@valuators = Valuator.includes(:user).all.order("users.username ASC")
@tags = ActsAsTaggableOn::Tag.where('taggings.taggable_type' => 'SpendingProposal').includes(:taggings)
end
def update
@spending_proposal = SpendingProposal.find(params[:id])
if @spending_proposal.update(spending_proposal_params)
redirect_to admin_spending_proposal_path(@spending_proposal), notice: t("flash.actions.update.spending_proposal")
else
@@ -44,7 +41,7 @@ class Admin::SpendingProposalsController < Admin::BaseController
private
def spending_proposal_params
params.require(:spending_proposal).permit(:administrator_id, :tag_list)
params.require(:spending_proposal).permit(:administrator_id, :tag_list, valuator_ids: [])
end
end