1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Remove activate_userkey permission

This commit is contained in:
Jeremy Stretch
2020-06-02 09:47:31 -04:00
parent 110bad7041
commit c6e85970d4
5 changed files with 9 additions and 6 deletions

View File

@@ -23,7 +23,7 @@ class UserKeyAdmin(admin.ModelAdmin):
actions = super().get_actions(request)
if 'delete_selected' in actions:
del actions['delete_selected']
if not request.user.has_perm('secrets.activate_userkey'):
if not request.user.has_perm('secrets.change_userkey'):
del actions['activate_selected']
return actions

View File

@@ -56,7 +56,6 @@ class Migration(migrations.Migration):
],
options={
'ordering': ['user__username'],
'permissions': (('activate_userkey', 'Can activate user keys for decryption'),),
},
),
migrations.AddField(

View File

@@ -64,9 +64,6 @@ class UserKey(models.Model):
class Meta:
ordering = ['user__username']
permissions = (
('activate_userkey', "Can activate user keys for decryption"),
)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

View File

@@ -14,9 +14,12 @@ def replicate_permissions(apps, schema_editor):
# TODO: Optimize this iteration so that ObjectPermissions with identical sets of users and groups
# are combined into a single ObjectPermission instance.
for perm in Permission.objects.all():
# Account for non-standard permission names; e.g. napalm_read
if perm.codename.split('_')[0] in ACTIONS:
# Account for non-standard legacy permission names; e.g. napalm_read
action = perm.codename.split('_')[0]
elif perm.codename == 'activate_userkey':
# Rename activate_userkey permission
action = 'change'
else:
action = perm.codename