starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-21 16:31:38 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Ensure all model FilterSets support the 'id' field

Browse Source
This commit is contained in:
Jeremy Stretch
2020-05-06 12:33:52 -04:00
parent 4d5d298ee1
commit 1ccb3162ff
14 changed files with 162 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/secrets/filters.py
View File

@@ -49,7 +49,7 @@ class SecretFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterS
class Meta:
model = Secret
fields = ['name']
fields = ['id', 'name']
def search(self, queryset, name, value):
if not value.strip():

7
netbox/secrets/tests/test_filters.py
View File

@@ -20,8 +20,7 @@ class SecretRoleTestCase(TestCase):
SecretRole.objects.bulk_create(roles)
def test_id(self):
id_list = self.queryset.values_list('id', flat=True)[:2]
params = {'id': [str(id) for id in id_list]}
params = {'id': self.queryset.values_list('pk', flat=True)[:2]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_name(self):
@@ -68,6 +67,10 @@ class SecretTestCase(TestCase):
for s in secrets:
s.save()
def test_id(self):
params = {'id': self.queryset.values_list('pk', flat=True)[:2]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_name(self):
params = {'name': ['Secret 1', 'Secret 2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)