|
@@ -30,7 +30,7 @@ def index():
|
|
|
for j in jobs
|
|
for j in jobs
|
|
|
}
|
|
}
|
|
|
instances = RemoteInstance.query.order_by(RemoteInstance.name).all()
|
|
instances = RemoteInstance.query.order_by(RemoteInstance.name).all()
|
|
|
- ynh_app_labels = {a["id"]: a.get("label", "") for a in get_ynh_apps()}
|
|
|
|
|
|
|
+ ynh_app_labels = {a["id"]: a.get("label") or a.get("name", "") for a in get_ynh_apps()}
|
|
|
return render_template("dashboard_local.html", jobs=jobs, last_runs=last_runs,
|
|
return render_template("dashboard_local.html", jobs=jobs, last_runs=last_runs,
|
|
|
instances=instances, ynh_app_labels=ynh_app_labels)
|
|
instances=instances, ynh_app_labels=ynh_app_labels)
|
|
|
|
|
|
|
@@ -154,7 +154,7 @@ def job_toggle(job_id):
|
|
|
def job_history(job_id):
|
|
def job_history(job_id):
|
|
|
job = db.get_or_404(Job, job_id)
|
|
job = db.get_or_404(Job, job_id)
|
|
|
runs = Run.query.filter_by(job_id=job_id).order_by(Run.started_at.desc()).limit(100).all()
|
|
runs = Run.query.filter_by(job_id=job_id).order_by(Run.started_at.desc()).limit(100).all()
|
|
|
- ynh_app_labels = {a["id"]: a.get("label", "") for a in get_ynh_apps()} if job.type == "ynh_app" else {}
|
|
|
|
|
|
|
+ ynh_app_labels = {a["id"]: a.get("label") or a.get("name", "") for a in get_ynh_apps()} if job.type == "ynh_app" else {}
|
|
|
return render_template("job_history.html", job=job, runs=runs, ynh_app_labels=ynh_app_labels)
|
|
return render_template("job_history.html", job=job, runs=runs, ynh_app_labels=ynh_app_labels)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -178,7 +178,7 @@ def archives():
|
|
|
runs_by_archive[run.archive_name] = run
|
|
runs_by_archive[run.archive_name] = run
|
|
|
jobs_by_id = {j.id: j for j in Job.query.all()}
|
|
jobs_by_id = {j.id: j for j in Job.query.all()}
|
|
|
|
|
|
|
|
- ynh_app_labels = {a["id"]: a.get("label", "") for a in get_ynh_apps()}
|
|
|
|
|
|
|
+ ynh_app_labels = {a["id"]: a.get("label") or a.get("name", "") for a in get_ynh_apps()}
|
|
|
|
|
|
|
|
items = []
|
|
items = []
|
|
|
for name in sorted_names:
|
|
for name in sorted_names:
|