[#6441] Refactor: extract and move method
This commit is contained in:
1 parent
2f77619fef
commit
edc9e84719
2 files changed
+5
-1
No files matched your search
@@ -26,7 +26,7 @@ module ContractsHelper
|
|||||||
|
|
||||||
def grouped_deliverable_options_for_select(project, selected_key=nil)
|
def grouped_deliverable_options_for_select(project, selected_key=nil)
|
||||||
project.contracts.all(:include => :deliverables).inject([]) do |html, contract|
|
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
|
# skip
|
||||||
else
|
else
|
||||||
options = contract.deliverables.collect do |deliverable|
|
options = contract.deliverables.collect do |deliverable|
|
||||||
|
|||||||
@@ -74,6 +74,10 @@ class Contract < ActiveRecord::Base
|
|||||||
self.status == "closed"
|
self.status == "closed"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def includes_deliverable_id?(deliverable_id)
|
||||||
|
deliverable_ids.include?(deliverable_id.to_i)
|
||||||
|
end
|
||||||
|
|
||||||
# ------------------------------------------------------------
|
# ------------------------------------------------------------
|
||||||
# Labor Methods
|
# Labor Methods
|
||||||
# ------------------------------------------------------------
|
# ------------------------------------------------------------
|
||||||
|
|||||||
Reference in new issue
Block a user