From ce1c1f04b6a2d058d96edcb326e5c3cb337bbc68 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Mon, 20 Jun 2022 16:44:27 +0000 Subject: [PATCH] Refactor @TimeEntryActivity.default()@ method (#33914). Patch by Holger Just. git-svn-id: https://svn.redmine.org/redmine/trunk@21669 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry_activity.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/time_entry_activity.rb b/app/models/time_entry_activity.rb index a0be39469..40505019c 100644 --- 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