Refactor @TimeEntryActivity.default()@ method (#33914).

Patch by Holger Just.

git-svn-id: https://svn.redmine.org/redmine/trunk@21669 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/time_entry_activity.rb b/app/models/time_entry_activity.rb
index a0be394691041e59b5b30b4b3fc07a5b5659279b..40505019ce44142fb553a3eb42ca5953a56242c8 100644 (file)
--- a/app/models/time_entry_activity.rb
+++ b/app/models/time_entry_activity.rb
@@ -24,11 +24,12 @@ class TimeEntryActivity < Enumeration
 
   def self.default(project=nil)
     default_activity = super()
-    if project.nil? || project.activities.blank? || project.activities.include?(default_activity)
+
+    if default_activity.nil? || project.nil? || project.activities.blank? || project.activities.include?(default_activity)
       return default_activity
     end
 
-    project.activities.find_by(parent_id: default_activity.id)
+    project.activities.detect { |activity| activity.parent_id == default_activity.id }
   end
 
   def option_name