diff --git a/run.py b/run.py index 0d1c530..9a0599c 100644 --- a/run.py +++ b/run.py @@ -181,7 +181,7 @@ async def create_job(app_id, app_list_name, repo, job_command_last_part): else: for i in job_command_last_part: - job_name = f"{app_id} ({app_list_name})" + i + job_name = f"{app_id}" + i # avoid scheduling twice if Job.select().where(Job.name == job_name, Job.state == "scheduled").count() > 0: diff --git a/templates/app.html b/templates/app.html index 0ba35f1..039d9bd 100644 --- a/templates/app.html +++ b/templates/app.html @@ -14,7 +14,7 @@ End time - {{job.name}}{{job.name}} (deleted) #{{job.id}} + #{{job.id}}#{{job.id}} (deleted) {{job.state}} {{timestampToDate(job.created_time)}} {{timestampToDate(job.started_time)}} diff --git a/templates/job.html b/templates/job.html index 62ed853..ec9a148 100644 --- a/templates/job.html +++ b/templates/job.html @@ -4,9 +4,8 @@

- Job '{{job.name}}' #{{job.id}} - Job '{{job.name}}' #{{job.id}} DELETED - <% if app %>for <{ app.name }> <% endif %> + (DELETED) + Job #{{job.id}} <% if app %>for <{ app.name }> <% endif %>