Skip to content

Commit

Permalink
Merge pull request #17 from eisuke/timeline_length
Browse files Browse the repository at this point in the history
Always define end_time for job limelines
  • Loading branch information
eisuke authored Nov 11, 2016
2 parents 9fd0a3a + a1e9d07 commit 4360253
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/kuroko2/job_timelines/dataset.json.jbuilder
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ json.data do
json.id instance.id
json.content "<a href='#{job_definition_job_instance_path(instance.job_definition, instance)}'>##{instance.job_definition.id} #{instance.job_definition.name}</a>"
json.start instance.created_at.strftime('%Y-%m-%d %H:%M:%S')
json.end (instance.error_at || instance.canceled_at || instance.finished_at).try!(:strftime, '%Y-%m-%d %H:%M:%S')
json.end (instance.error_at || instance.canceled_at || instance.finished_at || Time.current).try!(:strftime, '%Y-%m-%d %H:%M:%S')
json.group instance.job_definition.id
end
end

0 comments on commit 4360253

Please sign in to comment.