Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Limit visibility of unapproved packages to maintainers and approvers" and "Fix 404 on packages when not logged in"

Browse Source 
This reverts commit 85a178d90e.
This reverts commit 727db52c19.
This commit is contained in:
rubenwardy
2022-02-01 14:53:51 +00:00
parent afdf06b3f6
commit f8e82b63e3
6 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/packages.py
View File

@@ -599,7 +599,7 @@ class Package(db.Model):
def checkPerm(self, user, perm):
if not user.is_authenticated:
return perm == Permission.SEE_PACKAGE and self.state == PackageState.APPROVED
return False
if type(perm) == str:
perm = Permission[perm]
@@ -610,10 +610,7 @@ class Package(db.Model):
isMaintainer = isOwner or user.rank.atLeast(UserRank.EDITOR) or user in self.maintainers
isApprover = user.rank.atLeast(UserRank.APPROVER)
if perm == Permission.SEE_PACKAGE:
return self.state == PackageState.APPROVED or isMaintainer or isApprover
elif perm == Permission.CREATE_THREAD:
if perm == Permission.CREATE_THREAD:
return user.rank.atLeast(UserRank.MEMBER)
# Members can edit their own packages, and editors can edit any packages

1
app/models/users.py
View File

@@ -59,7 +59,6 @@ class UserRank(enum.Enum):
class Permission(enum.Enum):
SEE_PACKAGE = "SEE_PACKAGE"
EDIT_PACKAGE = "EDIT_PACKAGE"
DELETE_PACKAGE = "DELETE_PACKAGE"
CHANGE_AUTHOR = "CHANGE_AUTHOR"