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

Merge pull request #3419 from LextrendIT/feature/add_tags_to_milestones

Browse Source 
Add tags to milestones
This commit is contained in:
Raimond Garcia
2019-06-11 12:37:30 +02:00
committed by GitHub
parent dc03207fb3 be8a0dbe8a
commit 139b2720d8
32 changed files with 296 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

14
app/controllers/budgets/executions_controller.rb
View File

@@ -12,15 +12,15 @@ module Budgets
private
def investments_by_heading
base = @budget.investments.winners
base = base.joins(milestones: :translations).includes(:milestones)
base = base.tagged_with(params[:milestone_tag]) if params[:milestone_tag].present?
if params[:status].present?
@budget.investments.winners
.with_milestone_status_id(params[:status])
.uniq
.group_by(&:heading)
base = base.with_milestone_status_id(params[:status])
base.uniq.group_by(&:heading)
else
@budget.investments.winners
.joins(milestones: :translations)
.distinct.group_by(&:heading)
base.distinct.group_by(&:heading)
end
end