Merge branch 'develop' into feature

netbox/extras/forms/models.py

@@ -70,7 +70,7 @@ class CustomLinkForm(BootstrapMixin, forms.ModelForm):
 class ExportTemplateForm(BootstrapMixin, forms.ModelForm):
     content_type = ContentTypeChoiceField(
         queryset=ContentType.objects.all(),
-        limit_choices_to=FeatureQuery('custom_links')
+        limit_choices_to=FeatureQuery('export_templates')
     )
 
     class Meta:

netbox/extras/models/customfields.py

@@ -33,7 +33,7 @@ class CustomFieldManager(models.Manager.from_queryset(RestrictedQuerySet)):
         return self.get_queryset().filter(content_types=content_type)
 
 
-@extras_features('webhooks')
+@extras_features('webhooks', 'export_templates')
 class CustomField(ChangeLoggedModel):
     content_types = models.ManyToManyField(
         to=ContentType,

netbox/extras/models/models.py

@@ -35,7 +35,7 @@ __all__ = (
 )
 
 
-@extras_features('webhooks')
+@extras_features('webhooks', 'export_templates')
 class Webhook(ChangeLoggedModel):
     """
     A Webhook defines a request that will be sent to a remote application when an object is created, updated, and/or
@@ -177,7 +177,7 @@ class Webhook(ChangeLoggedModel):
             return json.dumps(context, cls=JSONEncoder)
 
 
-@extras_features('webhooks')
+@extras_features('webhooks', 'export_templates')
 class CustomLink(ChangeLoggedModel):
     """
     A custom link to an external representation of a NetBox object. The link text and URL fields accept Jinja2 template
@@ -230,7 +230,7 @@ class CustomLink(ChangeLoggedModel):
         return reverse('extras:customlink', args=[self.pk])
 
 
-@extras_features('webhooks')
+@extras_features('webhooks', 'export_templates')
 class ExportTemplate(ChangeLoggedModel):
     content_type = models.ForeignKey(
         to=ContentType,

netbox/extras/models/tags.py

@@ -13,7 +13,7 @@ from utilities.fields import ColorField
 # Tags
 #
 
-@extras_features('webhooks')
+@extras_features('webhooks', 'export_templates')
 class Tag(ChangeLoggedModel, TagBase):
     color = ColorField(
         default=ColorChoices.COLOR_GREY