Skip to content

Commit fe2c8aa

Browse files
committed
show all job logs in absolute order, not by status
1 parent a4769b4 commit fe2c8aa

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

cabotage/server/user/views.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2360,7 +2360,9 @@ def project_application(org_slug, project_slug, app_slug, env_slug=None):
23602360
application_environment_id=app_env.id,
23612361
process_name=proc_name,
23622362
)
2363-
.order_by(JobLog.completion_time.desc())
2363+
.order_by(
2364+
func.coalesce(JobLog.completion_time, JobLog.start_time).desc()
2365+
)
23642366
.first()
23652367
)
23662368
if last_log is not None:
@@ -6849,7 +6851,7 @@ def job_history(org_slug, project_slug, app_slug, process_name, env_slug=None):
68496851
application_environment_id=app_env.id,
68506852
process_name=process_name,
68516853
)
6852-
.order_by(JobLog.completion_time.desc())
6854+
.order_by(func.coalesce(JobLog.completion_time, JobLog.start_time).desc())
68536855
.limit(100)
68546856
.all()
68556857
)

0 commit comments

Comments
 (0)