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

Update django-taggit to 2.0

Browse Source
This commit is contained in:
jeremystretch
2021-12-06 13:25:09 -05:00
parent 414810bdf5
commit 0cd173f9df
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/tests/test_changelog.py
View File

@ -73,7 +73,7 @@ class ChangeLogViewTest(ModelViewTestCase):
site = Site(name='Site 1', slug='site-1') site = Site(name='Site 1', slug='site-1')
site.save() site.save()
tags = create_tags('Tag 1', 'Tag 2', 'Tag 3') tags = create_tags('Tag 1', 'Tag 2', 'Tag 3')
site.tags.set('Tag 1', 'Tag 2') site.tags.set(['Tag 1', 'Tag 2'])
form_data = { form_data = {
'name': 'Site X', 'name': 'Site X',
@ -117,7 +117,7 @@ class ChangeLogViewTest(ModelViewTestCase):
) )
site.save() site.save()
create_tags('Tag 1', 'Tag 2') create_tags('Tag 1', 'Tag 2')
site.tags.set('Tag 1', 'Tag 2') site.tags.set(['Tag 1', 'Tag 2'])
request = { request = {
'path': self._get_url('delete', instance=site), 'path': self._get_url('delete', instance=site),
@ -310,7 +310,7 @@ class ChangeLogAPITest(APITestCase):
} }
) )
site.save() site.save()
site.tags.set(*Tag.objects.all()[:2]) site.tags.set(Tag.objects.all()[:2])
self.assertEqual(ObjectChange.objects.count(), 0) self.assertEqual(ObjectChange.objects.count(), 0)
self.add_permissions('dcim.delete_site') self.add_permissions('dcim.delete_site')
url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk}) url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})

4
netbox/extras/tests/test_filtersets.py
View File

@ -542,8 +542,8 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
site = Site.objects.create(name='Site 1', slug='site-1') site = Site.objects.create(name='Site 1', slug='site-1')
provider = Provider.objects.create(name='Provider 1', slug='provider-1') provider = Provider.objects.create(name='Provider 1', slug='provider-1')
site.tags.set(tags[0]) site.tags.set([tags[0]])
provider.tags.set(tags[1]) provider.tags.set([tags[1]])
def test_name(self): def test_name(self):
params = {'name': ['Tag 1', 'Tag 2']} params = {'name': ['Tag 1', 'Tag 2']}

8
netbox/extras/tests/test_webhooks.py
View File

@ -123,7 +123,7 @@ class WebhookTest(APITestCase):
def test_enqueue_webhook_update(self): def test_enqueue_webhook_update(self):
site = Site.objects.create(name='Site 1', slug='site-1') site = Site.objects.create(name='Site 1', slug='site-1')
site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar'])) site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
# Update an object via the REST API # Update an object via the REST API
data = { data = {
@ -159,7 +159,7 @@ class WebhookTest(APITestCase):
) )
Site.objects.bulk_create(sites) Site.objects.bulk_create(sites)
for site in sites: for site in sites:
site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar'])) site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
# Update three objects via the REST API # Update three objects via the REST API
data = [ data = [
@ -205,7 +205,7 @@ class WebhookTest(APITestCase):
def test_enqueue_webhook_delete(self): def test_enqueue_webhook_delete(self):
site = Site.objects.create(name='Site 1', slug='site-1') site = Site.objects.create(name='Site 1', slug='site-1')
site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar'])) site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
# Delete an object via the REST API # Delete an object via the REST API
url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk}) url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
@ -231,7 +231,7 @@ class WebhookTest(APITestCase):
) )
Site.objects.bulk_create(sites) Site.objects.bulk_create(sites)
for site in sites: for site in sites:
site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar'])) site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
# Delete three objects via the REST API # Delete three objects via the REST API
data = [ data = [

2
netbox/netbox/api/serializers.py
View File

@ -175,7 +175,7 @@ class PrimaryModelSerializer(CustomFieldModelSerializer):
def _save_tags(self, instance, tags): def _save_tags(self, instance, tags):
if tags: if tags:
instance.tags.set(*[t.name for t in tags]) instance.tags.set([t.name for t in tags])
else: else:
instance.tags.clear() instance.tags.clear()