Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add support for editing labelling of one's own role (#18812)

Browse source 
Still disallow edition of rank or permissions
This commit is contained in:
Claire 2022-07-17 13:37:30 +02:00 • committed by GitHub
parent 05e39dc619
commit ecb3bb3256
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/user_role.rb
View file

@ -90,6 +90,7 @@ class UserRole < ApplicationRecord
validate :validate_permissions_elevation
validate :validate_position_elevation
validate :validate_dangerous_permissions
validate :validate_own_role_edition
before_validation :set_position
@ -165,6 +166,12 @@ class UserRole < ApplicationRecord
self.position = -1 if everyone?
end
def validate_own_role_edition
return unless defined?(@current_account) && @current_account.user_role.id == id
errors.add(:permissions_as_keys, :own_role) if permissions_changed?
errors.add(:position, :own_role) if position_changed?
end
def validate_permissions_elevation
errors.add(:permissions_as_keys, :elevated) if defined?(@current_account) && @current_account.user_role.computed_permissions & permissions != permissions
end