From c6735c7fe3d54bbfd09373dbdc1086d4804f3b46 Mon Sep 17 00:00:00 2001 From: Ina Date: Tue, 25 Oct 2022 17:51:40 +0200 Subject: [PATCH 1/3] return Former User if user deleted --- dds_web/api/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dds_web/api/project.py b/dds_web/api/project.py index f6ee47f37..19deeab81 100644 --- a/dds_web/api/project.py +++ b/dds_web/api/project.py @@ -492,7 +492,7 @@ def format_project_dict(self, current_user): "PI": p.pi, "Status": p.current_status, "Last updated": p.date_updated if p.date_updated else p.date_created, - "Created by": p.creator.name, + "Created by": p.creator.name if p.creator else "Former User", } # Get proj size and update total size From a691db79521ad30df383c6c1f0d9e472b0f0abd5 Mon Sep 17 00:00:00 2001 From: Ina Date: Tue, 25 Oct 2022 17:57:42 +0200 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 661bafb00..ae1445504 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -164,3 +164,4 @@ Please add a _short_ line describing the PR you make, if the PR implements a spe - Add version to the footer of the web pages ([#1304](https://github.com/ScilifelabDataCentre/dds_web/pull/1304)) - Add link to the dds instance to the end of all emails ([#1305](https://github.com/ScilifelabDataCentre/dds_web/pull/1305)) - Troubleshooting steps added to web page ([#1309](https://github.com/ScilifelabDataCentre/dds_web/pull/1309)) +- Bug: Return instead of project creator if user has been deleted ([#1311](https://github.com/ScilifelabDataCentre/dds_web/pull/1311)) From fd6eaa4bf9c81f42808ff0c05879aab8f140d0fa Mon Sep 17 00:00:00 2001 From: Ina Date: Tue, 25 Oct 2022 18:35:47 +0200 Subject: [PATCH 3/3] update to v3 --- .github/workflows/publish_and_trivyscan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_and_trivyscan.yml b/.github/workflows/publish_and_trivyscan.yml index 909d89d8f..45c0ee773 100644 --- a/.github/workflows/publish_and_trivyscan.yml +++ b/.github/workflows/publish_and_trivyscan.yml @@ -22,7 +22,7 @@ jobs: cancel-in-progress: true steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Log in to Docker Hub uses: docker/login-action@v2 with: