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

Fix conflics after rebase

Browse Source
This commit is contained in:
iagirre
2018-02-13 15:33:18 +01:00
parent 01f421717d
commit b8cc10d218
14 changed files with 176 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/budget/investment.rb
View File

@@ -65,6 +65,7 @@ class Budget
scope :under_valuation, -> { valuation_open.valuating.where("administrator_id IS NOT ?", nil) }
scope :managed, -> { valuation_open.where(valuator_assignments_count: 0).where("administrator_id IS NOT ?", nil) }
scope :valuating, -> { valuation_open.where("valuator_assignments_count > 0 OR valuator_group_assignments_count > 0" ) }
scope :visible_to_valuators, -> { where(visible_to_valuators: true) }
scope :valuation_finished, -> { where(valuation_finished: true) }
scope :valuation_finished_feasible, -> { where(valuation_finished: true, feasibility: "feasible") }
scope :feasible, -> { where(feasibility: "feasible") }