Merge pull request #1312 from ScilifelabDataCentre/dev

Bug fix for release
ScilifelabDataCentre · Oct 25, 2022 · b5624fe · b5624fe
2 parents 9ec2bee + d3047f0
commit b5624fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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:

diff --git 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))
diff --git 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