diff --git a/app/helpers/contracts_helper.rb b/app/helpers/contracts_helper.rb index 1991b94..41e2796 100644 --- a/app/helpers/contracts_helper.rb +++ b/app/helpers/contracts_helper.rb @@ -26,7 +26,7 @@ module ContractsHelper def grouped_deliverable_options_for_select(project, selected_key=nil) project.contracts.all(:include => :deliverables).inject([]) do |html, contract| - if contract.closed? && !contract.deliverable_ids.include?(selected_key.to_i) + if contract.closed? && !contract.includes_deliverable_id?(selected_key) # skip else options = contract.deliverables.collect do |deliverable| diff --git a/app/models/contract.rb b/app/models/contract.rb index dabad9c..aa52d8a 100644 --- a/app/models/contract.rb +++ b/app/models/contract.rb @@ -74,6 +74,10 @@ class Contract < ActiveRecord::Base self.status == "closed" end + def includes_deliverable_id?(deliverable_id) + deliverable_ids.include?(deliverable_id.to_i) + end + # ------------------------------------------------------------ # Labor Methods # ------------------------------------------------------------