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

Use organization role to check for edit and delete perms of service instances #148

Closed
tobru wants to merge 1 commit from instance-edit-permi-from-org into main
pull from: instance-edit-permi-from-org
merge into: servala:main
Conversation 2 Commits 1 Files changed 2 +29 -8
tobru commented 2025-07-07 11:11:53 +00:00
Owner
Copy link

Fixes #131

Fixes #131
tobru added 1 commit 2025-07-07 11:11:53 +00:00
use organization role to check for edit and delete perms
All checks were successful
Tests / test (push) Successful in 27s
Details
46d323528e
requested review from rixx 2025-07-07 11:12:00 +00:00
rixx reviewed 2025-07-07 12:05:21 +00:00
src/servala/frontend/views/organization.py
@ -79,3 +82,1 @@
instance.has_change_permission = self.request.user.has_perm(
"core.change_serviceinstance", instance
)
instance.has_change_permission = has_admin_permission
rixx commented 2025-07-07 12:05:11 +00:00
Member
Copy link

You could instead remove the is_staff permission from https://servala.app.codey.ch/servala/servala-portal/src/branch/main/src/servala/core/models/organization.py#L121

If you prefer to do the permission checks like this, I think we should remove the whole rules_permissions approach, because otherwise, it’ll be really unclear which places (views, middlewares, etc) will use the django-rules provided rules, and which places use methods like is_organization_admin directly.

You could instead remove the `is_staff` permission from https://servala.app.codey.ch/servala/servala-portal/src/branch/main/src/servala/core/models/organization.py#L121 If you prefer to do the permission checks like this, I think we should remove the whole `rules_permissions` approach, because otherwise, it’ll be really unclear which places (views, middlewares, etc) will use the `django-rules` provided rules, and which places use methods like `is_organization_admin` directly.
tobru commented 2025-07-08 09:21:55 +00:00
Author
Owner
Copy link

May I assign this PR to you to clean up as proposed?

May I assign this PR to you to clean up as proposed?
tobru marked this conversation as resolved
tobru commented 2025-07-11 14:56:15 +00:00
Author
Owner
Copy link

Replaced by #151

Replaced by #151
tobru closed this pull request 2025-07-11 14:56:15 +00:00
All checks were successful
Tests / test (push) Successful in 27s
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
rixx
Labels
Clear labels   
dependencies

Dependencies Update

  
bug

Something is not working

  
change

Change an existing feature

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
dependencies
bug
change
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: servala/servala-portal#148
No description provided.
Delete branch "instance-edit-permi-from-org"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?