From 67dd75a9808dfadf8888be890bd2a0957a6f78cc Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 17 Sep 2010 14:23:29 -0700 Subject: [PATCH] [#4477] Skip blank FixedBudget items in the deliverable details --- app/models/fixed_budget.rb | 8 +++++++- app/views/deliverables/_details_row.html.erb | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/fixed_budget.rb b/app/models/fixed_budget.rb index 9ea971c..bfbcb56 100644 --- a/app/models/fixed_budget.rb +++ b/app/models/fixed_budget.rb @@ -37,5 +37,11 @@ class FixedBudget < ActiveRecord::Base def straight_markup? markup && markup.match(/\$/) end - + + # Is this a blank budget item. Retainers will create blank ones when + # they are copied. (RetainerDeliverable#create_budgets_for_periods) + def blank_record? + return true if new_record? + return title.blank? && budget.blank? && markup.blank? + end end diff --git a/app/views/deliverables/_details_row.html.erb b/app/views/deliverables/_details_row.html.erb index 6e2b771..b2a6ccb 100644 --- a/app/views/deliverables/_details_row.html.erb +++ b/app/views/deliverables/_details_row.html.erb @@ -64,6 +64,7 @@ <% deliverable.fixed_budgets.each do |fixed_budget| %> + <% next if fixed_budget.blank_record? %> <%= h(fixed_budget.title) %> 0