Commit fd780ea7 by Van Hau Le

Fix bug

parent 13c83f5c
Pipeline #75 failed with stages
in 0 seconds
...@@ -40,7 +40,7 @@ module TimelogHelper ...@@ -40,7 +40,7 @@ module TimelogHelper
collection += case @issue&.tracker&.name collection += case @issue&.tracker&.name
when 'Task' when 'Task'
@issue.is_task_with_target? ? @issue.is_task_with_target? ?
TimeEntryActivity::TASK_WITH_TARGET_ACTIVITIES : activities.collect { |a| [a.name, a.id] if a.is_task_with_target? } :
activities.collect { |a| [a.name, a.id] if a.is_activity_for_task? } activities.collect { |a| [a.name, a.id] if a.is_activity_for_task? }
when 'Bug' when 'Bug'
activities.collect { |a| [a.name, a.id] if a.is_activity_for_task? } activities.collect { |a| [a.name, a.id] if a.is_activity_for_task? }
......
...@@ -59,4 +59,8 @@ class TimeEntryActivity < Enumeration ...@@ -59,4 +59,8 @@ class TimeEntryActivity < Enumeration
def is_activity_for_support? def is_activity_for_support?
SUPPORT_ACTIVITIES.include? name SUPPORT_ACTIVITIES.include? name
end end
def is_task_with_target?
TASK_WITH_TARGET_ACTIVITIES.include? name
end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment