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

Merge pull request #2622 from consul/selected-investments-map

Browse Source 
Adds message to selected budget investments
This commit is contained in:
Alberto
2018-06-06 19:21:24 +02:00
committed by GitHub
parent 88ff6560ee f1e722ac5c
commit f345786cc0
3 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/budgets_helper.rb
View File

@@ -66,7 +66,13 @@ module BudgetsHelper
def current_budget_map_locations
return unless current_budget.present?
MapLocation.where(investment_id: current_budget.investments).map { |l| l.json_data }
if current_budget.valuating_or_later?
investments = current_budget.investments.selected
else
investments = current_budget.investments
end
MapLocation.where(investment_id: investments).map { |l| l.json_data }
end
def display_calculate_winners_button?(budget)