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

Merge pull request #2342 from wairbut-m2c/iagirre-budgets-column-show-valuators

Browse Source 
Budget: add column show to valuators
This commit is contained in:
Alberto
2018-04-30 17:49:15 +02:00
committed by GitHub
parent 223c06f588 21a6d3495a
commit 1e8f4c7f32
13 changed files with 193 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/budget_investments_controller.rb
View File

@@ -96,7 +96,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
def budget_investment_params
params.require(:budget_investment)
.permit(:title, :description, :external_url, :heading_id, :administrator_id, :tag_list,
:valuation_tag_list, :incompatible, :selected, valuator_ids: [],
:valuation_tag_list, :incompatible, :visible_to_valuators, :selected, valuator_ids: [],
valuator_group_ids: [])
end

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

@@ -17,7 +17,7 @@ class Valuation::BudgetInvestmentsController < Valuation::BaseController
def index
@heading_filters = heading_filters
@investments = if current_user.valuator? && @budget.present?
@budget.investments.scoped_filter(params_for_current_valuator, @current_filter)
@budget.investments.visible_to_valuators.scoped_filter(params_for_current_valuator, @current_filter)
.order(cached_votes_up: :desc)
.page(params[:page])
else