servala/servala-portal
3
0
Fork 0
Code Issues 21 Pull requests 5 Projects 2 Releases Packages 2 Activity Actions

Merge pull request 'Try to fix permissions issue' (#151) from 148-instance-edit-permissions into main
All checks were successful
Build and Deploy Staging / build (push) Successful in 1m6s
Details
Tests / test (push) Successful in 24s
Details
Build and Deploy Staging / deploy (push) Successful in 22s
Details

Browse source 
Reviewed-on: #151
This commit is contained in:
Tobias Brunner 2025-07-11 14:55:47 +00:00
commit 683977a001
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/servala/core/models/service.py
View file

@ -574,7 +574,7 @@ class ServiceInstance(ServalaModelMixin, models.Model):
unique_together = [("name", "organization", "context")] unique_together = [("name", "organization", "context")]
rules_permissions = { rules_permissions = {
"view": rules.is_staff | perms.is_organization_member, "view": rules.is_staff | perms.is_organization_member,
"change": rules.is_staff | perms.is_organization_member, "change": rules.is_staff | perms.is_organization_admin,
"delete": rules.is_staff | perms.is_organization_admin, "delete": rules.is_staff | perms.is_organization_admin,
"add": rules.is_authenticated, "add": rules.is_authenticated,
} }

21
src/servala/core/rules.py
View file

@ -13,15 +13,30 @@ def has_organization_role(user, org, roles):
@rules.predicate @rules.predicate
def is_organization_owner(user, org): def is_organization_owner(user, obj):
if hasattr(obj, "organization"):
org = obj.organization
else:
org = obj
return has_organization_role(user, org, ["owner"]) return has_organization_role(user, org, ["owner"])
@rules.predicate @rules.predicate
def is_organization_admin(user, org): def is_organization_admin(user, obj):
if hasattr(obj, "organization"):
org = obj.organization
else:
org = obj
return has_organization_role(user, org, ["owner", "admin"]) return has_organization_role(user, org, ["owner", "admin"])
@rules.predicate @rules.predicate
def is_organization_member(user, org): def is_organization_member(user, obj):
if hasattr(obj, "organization"):
org = obj.organization
else:
org = obj
return has_organization_role(user, org, None) return has_organization_role(user, org, None)
rules.add_perm("core", rules.is_staff)