Fix fixed cost tasks being grouped under random projects in customer view
This commit is contained in:
parent
0f7c731124
commit
70c0ad4a54
|
@ -817,9 +817,11 @@ module StopTime::Controllers
|
||||||
cur_active_task = nil
|
cur_active_task = nil
|
||||||
@tasks.each do |task|
|
@tasks.each do |task|
|
||||||
if task.billed?
|
if task.billed?
|
||||||
if cur_active_task.nil?
|
if cur_active_task.nil? or
|
||||||
# Apparently there is no active task anymore, probably
|
task.name != cur_active_task.name
|
||||||
# it was a fixed-cost task
|
# Apparently, this is billed but it does not belong to the
|
||||||
|
# current active task, so probably it was a fixed-cost task
|
||||||
|
cur_active_task = task
|
||||||
@billed_tasks[task] = [task]
|
@billed_tasks[task] = [task]
|
||||||
else
|
else
|
||||||
@billed_tasks[cur_active_task] << task
|
@billed_tasks[cur_active_task] << task
|
||||||
|
|
Loading…
Reference in New Issue