From fc21de39912d466be52a0d20788424e506d9a090 Mon Sep 17 00:00:00 2001 From: Josef Smith Date: Tue, 4 Jul 2023 14:26:15 +0100 Subject: [PATCH] feat: link to gitlab logs on visualisation page --- dataworkspace/dataworkspace/apps/applications/views.py | 2 ++ .../dataworkspace/templates/visualisation_branch.html | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dataworkspace/dataworkspace/apps/applications/views.py b/dataworkspace/dataworkspace/apps/applications/views.py index ad2d8a4651..81c05efade 100644 --- a/dataworkspace/dataworkspace/apps/applications/views.py +++ b/dataworkspace/dataworkspace/apps/applications/views.py @@ -464,6 +464,7 @@ def visualisation_branch_html_GET(request, gitlab_project, branch_name): current_branch = matching_branches[0] latest_commit = current_branch["commit"] latest_commit_link = f'{gitlab_project["web_url"]}/commit/{latest_commit["id"]}' + latest_build_logs_link = f'{gitlab_project["web_url"]}/-/jobs' latest_commit_preview_link = ( f'{request.scheme}://{application_template.host_basename}--{latest_commit["short_id"]}' f".{settings.APPLICATION_ROOT_DOMAIN}/" @@ -523,6 +524,7 @@ def visualisation_branch_html_GET(request, gitlab_project, branch_name): "current_branch": current_branch, "latest_commit": latest_commit, "latest_commit_link": latest_commit_link, + "latest_build_logs_link": latest_build_logs_link, "latest_commit_preview_link": latest_commit_preview_link, "latest_commit_date": latest_commit_date, "can_release_latest_commit": can_release_latest_commit, diff --git a/dataworkspace/dataworkspace/templates/visualisation_branch.html b/dataworkspace/dataworkspace/templates/visualisation_branch.html index 628b2ff1ab..e17b52e933 100644 --- a/dataworkspace/dataworkspace/templates/visualisation_branch.html +++ b/dataworkspace/dataworkspace/templates/visualisation_branch.html @@ -69,6 +69,11 @@

Latest commit: {{ latest_commit.short_id View latest commit{{ latest_commit.short_id }} in GitLab +
  • + + View GitLab build logs + +
  • Preview visualisation at latest commit {{ latest_commit.short_id }}