dinislage/redmine_contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#6636] Support nil categories in Deliverable's issue_category methods

Browse Source
This commit is contained in:
Eric Davis
2011-10-13 15:29:51 -07:00
parent ac050d7905
commit bbf5d70170
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/deliverable.rb
+14 -2
View File
@@ -371,13 +371,25 @@ class Deliverable < ActiveRecord::Base
end end
def spent_for_issue_category(category, billable_time_only) def spent_for_issue_category(category, billable_time_only)
time_entries = project.time_entries.all(:conditions => ["#{TimeEntry.table_name}.issue_id IN (?) AND #{Issue.table_name}.category_id IN (?)", issue_ids, category.id], :include => [:issue]) conditions = ARCondition.new(["#{TimeEntry.table_name}.issue_id IN (?)", issue_ids])
if category.present?
conditions.add(["#{Issue.table_name}.category_id IN (?)", category.id])
else
conditions.add("#{Issue.table_name}.category_id IS NULL")
end
time_entries = project.time_entries.all(:conditions => conditions.conditions, :include => [:issue])
time_entries.select {|time| time.billable? == billable_time_only }.sum(&:cost) time_entries.select {|time| time.billable? == billable_time_only }.sum(&:cost)
end end
def hours_spent_for_issue_category(category, billable_time_only) def hours_spent_for_issue_category(category, billable_time_only)
time_entries = project.time_entries.all(:conditions => ["#{TimeEntry.table_name}.issue_id IN (?) AND #{Issue.table_name}.category_id IN (?)", issue_ids, category.id], :include => [:issue]) conditions = ARCondition.new(["#{TimeEntry.table_name}.issue_id IN (?)", issue_ids])
if category.present?
conditions.add(["#{Issue.table_name}.category_id IN (?)", category.id])
else
conditions.add("#{Issue.table_name}.category_id IS NULL")
end
time_entries = project.time_entries.all(:conditions => conditions.conditions, :include => [:issue])
time_entries.select {|time| time.billable? == billable_time_only }.sum(&:hours) time_entries.select {|time| time.billable? == billable_time_only }.sum(&:hours)
end end