Skip to content

Commit

Permalink
AttributeError occurs in creator_name when the user is missing
Browse files Browse the repository at this point in the history
  • Loading branch information
mamico committed Jan 23, 2025
1 parent 5a120c4 commit b588327
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/plone/restapi/services/locking/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

def creator_name(username):
user = api.user.get(username=username)
return user.getProperty("fullname") or username
if user:
return user.getProperty("fullname") or username
else:
return username


def creator_url(username):
Expand Down
19 changes: 19 additions & 0 deletions src/plone/restapi/tests/test_locking.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from plone import api
from plone.app.testing import login
from plone.app.testing import SITE_OWNER_NAME
from plone.app.testing import SITE_OWNER_PASSWORD
Expand Down Expand Up @@ -112,3 +113,21 @@ def test_update_locked_object_with_token_succeeds(self):
transaction.commit()
self.assertEqual(response.status_code, 204)
self.assertEqual(self.doc.Title(), "New Title")

def test_lock_user_removed(self):
lockable = ILockable(self.doc)
api.user.create(
username="foo",
email="foo@bar.com",
roles=["Manager"],
)
with api.env.adopt_user(username="foo"):
lockable.lock()
api.user.delete(username="foo")
transaction.commit()
# the user that locked the object is no longer present
response = self.api_session.get("/@lock")
self.assertEqual(response.status_code, 200)
self.assertEqual(response.json()["creator"], "foo")
self.assertEqual(response.json()["creator_name"], "foo")
self.assertTrue(lockable.locked())

0 comments on commit b588327

Please sign in to comment.