Skip to content

Commit 420090d

Browse files
committed
#12590: Exclude proxy model for Token from permission object types
1 parent 4ab0eb5 commit 420090d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

netbox/users/constants.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
OBJECTPERMISSION_OBJECT_TYPES = Q(
5-
~Q(app_label__in=['admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']) |
5+
~Q(app_label__in=['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']) |
66
Q(app_label='auth', model__in=['group', 'user']) |
77
Q(app_label='users', model__in=['objectpermission', 'token'])
88
)

netbox/users/migrations/0001_squashed_0011.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Migration(migrations.Migration):
6666
('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
6767
('constraints', models.JSONField(blank=True, null=True)),
6868
('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
69-
('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.ContentType')),
69+
('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.ContentType')),
7070
('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
7171
],
7272
options={

0 commit comments

Comments
 (0)