diff --git a/app/models/project.rb b/app/models/project.rb index dc1709d84..b03c5bfe2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -703,7 +703,7 @@ class Project < ActiveRecord::Base # or nil if the module is not enabled for the project def enabled_module(name) name = name.to_s - enabled_modules.detect {|m| m.name == name} + enabled_modules.find_by(name: name) end # Return true if the module with the given name is enabled @@ -741,7 +741,7 @@ class Project < ActiveRecord::Base # project.disable_module!("issue_tracking") # project.disable_module!(project.enabled_modules.first) def disable_module!(target) - target = enabled_modules.detect{|mod| target.to_s == mod.name} unless enabled_modules.include?(target) + target = enabled_modules.find_by(name: target.to_s) unless enabled_modules.include?(target) target.destroy unless target.blank? end @@ -986,7 +986,7 @@ class Project < ActiveRecord::Base new_issue.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h} # Reassign fixed_versions by name, since names are unique per project if issue.fixed_version && issue.fixed_version.project == project - new_issue.fixed_version = self.versions.detect {|v| v.name == issue.fixed_version.name} + new_issue.fixed_version = self.versions.find_by(name: issue.fixed_version.name) end # Reassign version custom field values new_issue.custom_field_values.each do |custom_value| @@ -994,7 +994,7 @@ class Project < ActiveRecord::Base versions = Version.where(:id => custom_value.value).to_a new_value = versions.map do |version| if version.project == project - self.versions.detect {|v| v.name == version.name}.try(:id) + self.versions.find_by(name: version.name).try(:id) else version.id end @@ -1006,7 +1006,7 @@ class Project < ActiveRecord::Base end # Reassign the category by name, since names are unique per project if issue.category - new_issue.category = self.issue_categories.detect {|c| c.name == issue.category.name} + new_issue.category = self.issue_categories.find_by(name: issue.category.name) end # Parent issue if issue.parent_id