diff --git a/netbox/extras/migrations/0024_scripts.py b/netbox/extras/migrations/0024_scripts.py index 82d0afdc9..c8d81e5e2 100644 --- a/netbox/extras/migrations/0024_scripts.py +++ b/netbox/extras/migrations/0024_scripts.py @@ -16,7 +16,6 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ], options={ - 'permissions': (('run_script', 'Can run script'),), 'managed': False, }, ), diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py index a94fc3eea..9e000774f 100644 --- a/netbox/extras/models/models.py +++ b/netbox/extras/models/models.py @@ -564,9 +564,6 @@ class Script(models.Model): """ class Meta: managed = False - permissions = ( - ('run_script', 'Can run script'), - ) # diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py index 66084c3be..b25698a36 100644 --- a/netbox/users/migrations/0009_replicate_permissions.py +++ b/netbox/users/migrations/0009_replicate_permissions.py @@ -15,11 +15,11 @@ def replicate_permissions(apps, schema_editor): # are combined into a single ObjectPermission instance. for perm in Permission.objects.all(): 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' + elif perm.codename == 'run_script': + action = 'run' else: action = perm.codename