meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Patch by Holger Just.


git-svn-id: https://svn.redmine.org/redmine/trunk@21669 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-06-20 16:44:27 +00:00
parent bfcb1b0054
commit ce1c1f04b6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/time_entry_activity.rb
View File

@ -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