瀏覽代碼

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

Patch by Holger Just.


git-svn-id: https://svn.redmine.org/redmine/trunk@21669 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/5.1.0
Marius Balteanu 2 年之前
父節點
當前提交
ce1c1f04b6
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3
    2
      app/models/time_entry_activity.rb

+ 3
- 2
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

Loading…
取消
儲存