feature: names fixes
This commit is contained in:
parent
2dcb9984c7
commit
1c3d177833
4 changed files with 5 additions and 5 deletions
|
|
@ -1267,7 +1267,7 @@ class User(Base, BaseModel):
|
|||
user = cls.scalars(stmt).first()
|
||||
|
||||
if user is None:
|
||||
raise Exception("FATAL: Missing ghost account!")
|
||||
raise Exception("FATAL: Missing ghost user!")
|
||||
return user
|
||||
|
||||
@classmethod
|
||||
|
|
|
|||
|
|
@ -666,7 +666,7 @@ class RepoModel(BaseModel):
|
|||
member_name = User.get(member_id).username
|
||||
|
||||
if member_name == User.GHOST_USER:
|
||||
raise ValueError("Modify user permissions for ghost account is not allowed.")
|
||||
raise ValueError("Modify user permissions for ghost user is not allowed.")
|
||||
|
||||
if member_name == User.DEFAULT_USER:
|
||||
# NOTE(dan): detect if we changed permissions for default user
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ class RepoGroupModel(BaseModel):
|
|||
member_name = member_obj.username
|
||||
is_repo_group = isinstance(obj, RepoGroup) and obj == repo_group
|
||||
if is_repo_group and member_name == User.GHOST_USER:
|
||||
raise ValueError("Modify user permissions for ghost account is not allowed.")
|
||||
raise ValueError("Modify user permissions for ghost user is not allowed.")
|
||||
|
||||
if is_repo_group and member_name == User.DEFAULT_USER:
|
||||
# NOTE(dan): detect if we changed permissions for default user
|
||||
|
|
|
|||
|
|
@ -497,9 +497,9 @@ class UserModel(BaseModel):
|
|||
pr.description += " \n::detached pull requests from deleted user: %s" % (username,)
|
||||
self.sa.add(pr)
|
||||
|
||||
def _detach_user_artifacts(self, username, artifacts, handle_user):
|
||||
def _detach_user_artifacts(self, username, artifacts, new_user):
|
||||
for a in artifacts:
|
||||
a.upload_user = handle_user
|
||||
a.upload_user = new_user
|
||||
# set description we know why ghost now owns
|
||||
# additional artifacts that were orphaned !
|
||||
a.file_description += " \n::detached artifact from deleted user: %s" % (username,)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue