nautobot 2.1.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/extras/models/models.py

@@ -6,8 +6,8 @@ from db_file_storage.storage import DatabaseFileStorage
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.core.files.storage import get_storage_class
 from django.core.exceptions import ValidationError
+from django.core.files.storage import get_storage_class
 from django.core.serializers.json import DjangoJSONEncoder
 from django.core.validators import MinValueValidator
 from django.db import models
@@ -37,7 +37,7 @@ from nautobot.extras.querysets import ConfigContextQuerySet, NotesQuerySet
 from nautobot.extras.utils import extras_features, FeatureQuery, image_upload
 
 # Avoid breaking backward compatibility on anything that might expect these to still be defined here:
-from .jobs import JOB_LOGS, Job, JobLogEntry, JobResult, ScheduledJob, ScheduledJobs  # noqa: F401
+from .jobs import Job, JOB_LOGS, JobLogEntry, JobResult, ScheduledJob, ScheduledJobs  # noqa: F401  # unused-import
 
 #
 # Config contexts
@@ -193,35 +193,14 @@ class ConfigContextModel(models.Model, ConfigContextSchemaValidationMixin):
         """
         Return the rendered configuration context for a device or VM.
         """
-
         if not hasattr(self, "config_context_data"):
             # Annotation not available, so fall back to manually querying for the config context
             config_context_data = ConfigContext.objects.get_for_object(self).values_list("data", flat=True)
         else:
             config_context_data = self.config_context_data or []
-            # Device and VirtualMachine's Location has its own ConfigContext and its parent Locations' ConfigContext, if any, should
-            # also be applied. However, since moving from mptt to django-tree-queries https://github.com/nautobot/nautobot/issues/510,
-            # we lost the ability to query the ancestors for a particular tree node for subquery https://github.com/matthiask/django-tree-queries/issues/54.
-            # So instead of constructing the location related query in ConfigContextModelQueryset._get_config_context_filters(), which is complicated across databases
-            # We append the missing parent location query here as a patch.
-            location_config_context_queryset = ConfigContext.objects.none()
-            if self._meta.model_name == "device":
-                location_config_context_queryset = ConfigContext.objects.filter(
-                    locations__in=self.location.ancestors(include_self=True)
-                ).distinct()
-            else:
-                if self.cluster and self.cluster.location:
-                    location_config_context_queryset = ConfigContext.objects.filter(
-                        locations__in=self.cluster.location.ancestors(include_self=True)
-                    ).distinct()
-
-            # Annotation has keys "weight" and "name" (used for ordering) and "data" (the actual config context data)
-            for cc in location_config_context_queryset:
-                config_context_data.append({"data": cc.data, "name": cc.name, "weight": cc.weight})
             config_context_data = [
                 c["data"] for c in sorted(config_context_data, key=lambda k: (k["weight"], k["name"]))
             ]
-
         # Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs
         data = OrderedDict()
         for context in config_context_data:
@@ -489,6 +468,23 @@ class ExternalIntegration(PrimaryModel):
         null=True,
         help_text="Optional user-defined JSON data for this integration",
     )
+    http_method = models.CharField(
+        max_length=10,
+        choices=WebhookHttpMethodChoices,
+        verbose_name="HTTP method",
+        blank=True,
+    )
+    headers = models.JSONField(
+        encoder=DjangoJSONEncoder,
+        blank=True,
+        null=True,
+        help_text="Headers for the HTTP request",
+    )
+    ca_file_path = models.CharField(
+        max_length=255,
+        blank=True,
+        verbose_name="CA file path",
+    )
 
     def __str__(self):
         return f"{self.name} ({self.remote_url})"
@@ -496,6 +492,47 @@ class ExternalIntegration(PrimaryModel):
     class Meta:
         ordering = ["name"]
 
+    def render_headers(self, context):
+        """
+        Render headers and return a dict of Header: Value pairs.
+
+        Raises:
+            TemplateAssertionError: Raised when an invalid template helper function exists in headers.
+            TemplateSyntaxError: Raised when an invalid template variable exists in headers.
+            json.decoder.JSONDecodeError: Raised when invalid JSON data exists in context.
+        """
+        if not self.headers:
+            return {}
+
+        data = json.loads(render_jinja2(json.dumps(self.headers, ensure_ascii=False), context))
+        return data
+
+    def render_extra_config(self, context):
+        """
+        Render extra_config and return a dict of Key: Value pairs.
+
+        Raises:
+            TemplateAssertionError: Raised when an invalid template helper function exists in extra_config.
+            TemplateSyntaxError: Raised when an invalid template variable exists in extra_config.
+            json.decoder.JSONDecodeError: Raised when invalid JSON data exists in context.
+        """
+        if not self.extra_config:
+            return {}
+
+        data = json.loads(render_jinja2(json.dumps(self.extra_config, ensure_ascii=False), context))
+        return data
+
+    def render_remote_url(self, context):
+        """
+        Render remote_url in jinja2 templates.
+
+        Raises:
+            TemplateAssertionError: Raised when an invalid template helper function exists in remote_url.
+            TemplateSyntaxError: Raised when an invalid template variable exists in remote_url.
+        """
+        data = render_jinja2(self.remote_url, context)
+        return data
+
 
 #
 # File attachments
@@ -812,7 +849,7 @@ class Webhook(BaseModel, ChangeLoggedModel, NotesMixin):
         blank=True,
         help_text="User-supplied HTTP headers to be sent with the request in addition to the HTTP content type. "
         "Headers should be defined in the format <code>Name: Value</code>. Jinja2 template processing is "
-        "support with the same context as the request body (below).",
+        "supported with the same context as the request body (below).",
     )
     body_template = models.TextField(
         blank=True,

nautobot/extras/models/relationships.py

@@ -1,8 +1,8 @@
 import logging
 
 from django import forms
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
@@ -21,11 +21,10 @@ from nautobot.core.models.fields import AutoSlugField, slugify_dashes_to_undersc
 from nautobot.core.models.querysets import RestrictedQuerySet
 from nautobot.core.templatetags.helpers import bettertitle
 from nautobot.core.utils.lookup import get_filterset_for_model, get_route_for_model
-from nautobot.extras.choices import RelationshipTypeChoices, RelationshipRequiredSideChoices, RelationshipSideChoices
-from nautobot.extras.utils import FeatureQuery, check_if_key_is_graphql_safe, extras_features
+from nautobot.extras.choices import RelationshipRequiredSideChoices, RelationshipSideChoices, RelationshipTypeChoices
 from nautobot.extras.models import ChangeLoggedModel
 from nautobot.extras.models.mixins import NotesMixin
-
+from nautobot.extras.utils import check_if_key_is_graphql_safe, extras_features, FeatureQuery
 
 logger = logging.getLogger(__name__)
 
@@ -564,10 +563,15 @@ class Relationship(BaseModel, ChangeLoggedModel, NotesMixin):
 
         return field
 
+    def save(self, *args, **kwargs):
+        self.clean()
+        super().save(*args, **kwargs)
+
     def clean(self):
         # Check if relationship.key is graphql safe.
         if self.key != "":
             check_if_key_is_graphql_safe(self.__class__.__name__, self.key)
+
         # Check if source and destination filters are valid
         for side in ["source", "destination"]:
             if not getattr(self, f"{side}_filter"):

nautobot/extras/models/roles.py

@@ -3,7 +3,7 @@ from django.db import models
 
 from nautobot.core.models.fields import ForeignKeyLimitedByContentTypes
 from nautobot.core.models.name_color_content_types import NameColorContentTypesModel
-from nautobot.extras.utils import RoleModelsQuery, extras_features
+from nautobot.extras.utils import extras_features, RoleModelsQuery
 
 
 @extras_features(

nautobot/extras/models/secrets.py

@@ -3,8 +3,7 @@ import logging
 from django.core.exceptions import ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
-
-from jinja2.exceptions import UndefinedError, TemplateSyntaxError
+from jinja2.exceptions import TemplateSyntaxError, UndefinedError
 
 from nautobot.core.models import BaseModel
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
@@ -14,7 +13,6 @@ from nautobot.extras.registry import registry
 from nautobot.extras.secrets.exceptions import SecretError, SecretParametersError, SecretProviderError
 from nautobot.extras.utils import extras_features
 
-
 logger = logging.getLogger(__name__)
 
 

nautobot/extras/models/tags.py

@@ -11,7 +11,6 @@ from nautobot.extras.models.mixins import NotesMixin
 from nautobot.extras.models.relationships import RelationshipModel
 from nautobot.extras.utils import extras_features, TaggableClassesQuery
 
-
 #
 # Tags
 #

nautobot/extras/navigation.py

@@ -8,7 +8,6 @@ from nautobot.core.apps import (
     NavMenuTab,
 )
 
-
 menu_items = (
     NavMenuTab(
         name="Organization",

nautobot/extras/plugins/__init__.py

@@ -1,27 +1,26 @@
 import collections
-import inspect
 from functools import partial
 from importlib import import_module
+import inspect
 from logging import getLogger
 
-from packaging import version
-
 from django.core.exceptions import ValidationError
 from django.template.loader import get_template
 from django.urls import get_resolver, URLPattern
+from packaging import version
 
 from nautobot.core.apps import (
     NautobotConfig,
     NavMenuTab,
-    register_menu_items,
     register_homepage_panels,
+    register_menu_items,
 )
-from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.core.signals import nautobot_database_ready
+from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.extras.choices import BannerClassChoices
-from nautobot.extras.registry import registry, register_datasource_contents
 from nautobot.extras.plugins.exceptions import PluginImproperlyConfigured
 from nautobot.extras.plugins.utils import import_object
+from nautobot.extras.registry import register_datasource_contents, registry
 from nautobot.extras.secrets import register_secrets_provider
 
 logger = getLogger(__name__)
@@ -462,8 +461,8 @@ def register_filter_extensions(filter_extensions, plugin_name):
     """
     Register a list of FilterExtension classes
     """
-    from nautobot.core.utils.lookup import get_filterset_for_model, get_form_for_model
     from nautobot.core.forms.utils import add_field_to_filter_form_class
+    from nautobot.core.utils.lookup import get_filterset_for_model, get_form_for_model
 
     for filter_extension in filter_extensions:
         if not issubclass(filter_extension, FilterExtension):

nautobot/extras/plugins/tables.py

@@ -1,7 +1,6 @@
 from django.contrib.auth.models import AnonymousUser
 from django.urls import reverse
 from django.utils.html import format_html
-
 import django_tables2 as tables
 
 
@@ -11,7 +10,7 @@ class InstalledPluginsTable(tables.Table):
     """
 
     name = tables.Column(
-        linkify=lambda record: reverse("plugins:plugin_detail", kwargs={"plugin": record["package_name"]})
+        linkify=lambda record: reverse("plugins:plugin_detail", kwargs={"plugin": record["app_label"]})
     )
     package_name = tables.Column()
     author = tables.Column()

nautobot/extras/plugins/utils.py

@@ -9,9 +9,9 @@ import sys
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.module_loading import import_string
 
-from .exceptions import PluginNotFound, PluginImproperlyConfigured
 from nautobot.core.settings_funcs import ConstanceConfigItem
 
+from .exceptions import PluginImproperlyConfigured, PluginNotFound
 
 # Logging object
 logger = logging.getLogger(__name__)

nautobot/extras/plugins/views.py

@@ -7,14 +7,13 @@ from django.http import Http404
 from django.shortcuts import render
 from django.urls.exceptions import NoReverseMatch
 from django.views.generic import View
+from django_tables2 import RequestConfig
 from drf_spectacular.utils import extend_schema
 from rest_framework import permissions
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.views import APIView
 
-from django_tables2 import RequestConfig
-
 from nautobot.core.api.views import NautobotAPIVersionMixin
 from nautobot.core.forms import TableConfigForm
 from nautobot.core.views.mixins import AdminRequiredMixin
@@ -30,24 +29,25 @@ class InstalledPluginsView(AdminRequiredMixin, View):
     table = InstalledPluginsTable
 
     def get(self, request):
-        plugins = [apps.get_app_config(plugin) for plugin in settings.PLUGINS]
         data = []
-        for plugin in plugins:
-            data.append(
-                {
-                    "name": plugin.verbose_name,
-                    "package_name": plugin.name,
-                    "author": plugin.author,
-                    "author_email": plugin.author_email,
-                    "description": plugin.description,
-                    "version": plugin.version,
-                    "actions": {
-                        "home": plugin.home_view_name,
-                        "configure": plugin.config_view_name,
-                        "docs": plugin.docs_view_name,
-                    },
-                }
-            )
+        for plugin in apps.get_app_configs():
+            if plugin.name in settings.PLUGINS:
+                data.append(
+                    {
+                        "name": plugin.verbose_name,
+                        "package_name": plugin.name,
+                        "app_label": plugin.label,
+                        "author": plugin.author,
+                        "author_email": plugin.author_email,
+                        "description": plugin.description,
+                        "version": plugin.version,
+                        "actions": {
+                            "home": plugin.home_view_name,
+                            "configure": plugin.config_view_name,
+                            "docs": plugin.docs_view_name,
+                        },
+                    }
+                )
         table = self.table(data, user=request.user)
 
         paginate = {
@@ -73,10 +73,10 @@ class InstalledPluginDetailView(LoginRequiredMixin, View):
     """
 
     def get(self, request, plugin):
-        if plugin not in settings.PLUGINS:
+        plugin_config = apps.get_app_config(plugin)
+        if plugin_config.name not in settings.PLUGINS:
             raise Http404
 
-        plugin_config = apps.get_app_config(plugin)
         return render(
             request,
             "extras/plugin_detail.html",

nautobot/extras/querysets.py

@@ -1,12 +1,12 @@
-from django.core.cache import cache
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Model, OuterRef, Subquery, Q, F
+from django.core.cache import cache
+from django.db.models import F, Model, OuterRef, Q, Subquery
 from django.db.models.functions import JSONObject
 from django_celery_beat.managers import ExtendedQuerySet
 
-from nautobot.core.models.querysets import RestrictedQuerySet
 from nautobot.core.models.query_functions import EmptyGroupByJSONBAgg
+from nautobot.core.models.querysets import RestrictedQuerySet
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.extras.models.tags import TaggedItem
 
@@ -30,7 +30,12 @@ class ConfigContextQuerySet(RestrictedQuerySet):
 
         # Get the group of the assigned tenant, if any
         tenant_group = obj.tenant.tenant_group if obj.tenant else None
+        tenant = obj.tenant if obj.tenant else None
 
+        if tenant_group:
+            tenant_groups = tenant_group.ancestors(include_self=True)
+        else:
+            tenant_groups = []
         # Match against the directly assigned location as well as any parent locations
         location = getattr(obj, "location", None)
         if location:
@@ -46,8 +51,8 @@ class ConfigContextQuerySet(RestrictedQuerySet):
             Q(cluster_groups=cluster_group) | Q(cluster_groups=None),
             Q(clusters=cluster) | Q(clusters=None),
             Q(device_redundancy_groups=device_redundancy_group) | Q(device_redundancy_groups=None),
-            Q(tenant_groups=tenant_group) | Q(tenant_groups=None),
-            Q(tenants=obj.tenant) | Q(tenants=None),
+            Q(tenant_groups__in=tenant_groups) | Q(tenant_groups=None),
+            Q(tenants=tenant) | Q(tenants=None),
             Q(tags__name__in=obj.tags.names()) | Q(tags=None),
         ]
         if settings.CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED:
@@ -122,27 +127,39 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
             Q(platforms=OuterRef("platform")) | Q(platforms=None),
             Q(cluster_groups=OuterRef("cluster__cluster_group")) | Q(cluster_groups=None),
             Q(clusters=OuterRef("cluster")) | Q(clusters=None),
-            Q(tenant_groups=OuterRef("tenant__tenant_group")) | Q(tenant_groups=None),
             Q(tenants=OuterRef("tenant")) | Q(tenants=None),
             Q(tags__pk__in=Subquery(TaggedItem.objects.filter(**tag_query_filters).values_list("tag_id", flat=True)))
             | Q(tags=None),
             is_active=True,
         )
         base_query.add((Q(roles=OuterRef("role")) | Q(roles=None)), Q.AND)
+
+        from nautobot.dcim.models import Location
+        from nautobot.tenancy.models import TenantGroup
+
         if self.model._meta.model_name == "device":
+            location_query_string = "location"
             base_query.add((Q(device_types=OuterRef("device_type")) | Q(device_types=None)), Q.AND)
             base_query.add(
                 (Q(device_redundancy_groups=OuterRef("device_redundancy_group")) | Q(device_redundancy_groups=None)),
                 Q.AND,
             )
-            # This is necessary to prevent location related config context to be applied now.
-            # The location hierarchy cannot be processed by the database and must be added by `ConfigContextModel.get_config_context`
-            base_query.add((Q(locations=None)), Q.AND)
-        elif self.model._meta.model_name == "virtualmachine":
-            # This is necessary to prevent location related config context to be applied now.
-            # The location hierarchy cannot be processed by the database and must be added by `ConfigContextModel.get_config_context`
-            base_query.add((Q(locations=None)), Q.AND)
+        else:
+            location_query_string = "cluster__location"
+
+        location_query = Q(locations=None) | Q(locations=OuterRef(location_query_string))
+        for _ in range(Location.objects.max_tree_depth() + 1):
+            location_query_string += "__parent"
+            location_query |= Q(locations=OuterRef(location_query_string))
+
+        base_query.add((location_query), Q.AND)
 
+        tenant_group_query_string = "tenant__tenant_group"
+        tenant_group_query = Q(tenant_groups=None) | Q(tenant_groups=OuterRef(tenant_group_query_string))
+        for _ in range(TenantGroup.objects.max_tree_depth() + 1):
+            tenant_group_query_string += "__parent"
+            tenant_group_query |= Q(tenant_groups=OuterRef(tenant_group_query_string))
+        base_query.add((tenant_group_query), Q.AND)
         return base_query
 
 

nautobot/extras/signals.py

@@ -1,9 +1,9 @@
 import contextvars
+from datetime import timedelta
+import logging
 import os
-import random
+import secrets
 import shutil
-import logging
-from datetime import timedelta
 
 from db_file_storage.model_utils import delete_file
 from db_file_storage.storage import DatabaseFileStorage
@@ -13,15 +13,15 @@ from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.core.files.storage import get_storage_class
 from django.db import transaction
-from django.db.models.signals import m2m_changed, pre_delete, post_save, pre_save, post_delete
+from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
 from django.dispatch import receiver
 from django.utils import timezone
 from django_prometheus.models import model_deletes, model_inserts, model_updates
 
 from nautobot.core.celery import app, import_jobs_as_celery_tasks
 from nautobot.core.utils.config import get_settings_or_config
-from nautobot.extras.constants import CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
 from nautobot.extras.choices import JobResultStatusChoices, ObjectChangeActionChoices
+from nautobot.extras.constants import CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
 from nautobot.extras.models import (
     CustomField,
     DynamicGroup,
@@ -34,7 +34,6 @@ from nautobot.extras.querysets import NotesQuerySet
 from nautobot.extras.tasks import delete_custom_field_data, provision_field
 from nautobot.extras.utils import refresh_job_model_from_job_class
 
-
 # thread safe change context state variable
 change_context_state = contextvars.ContextVar("change_context_state", default=None)
 logger = logging.getLogger(__name__)
@@ -127,7 +126,7 @@ def _handle_changed_object(sender, instance, raw=False, **kwargs):
 
     # Housekeeping: 0.1% chance of clearing out expired ObjectChanges
     changelog_retention = get_settings_or_config("CHANGELOG_RETENTION")
-    if changelog_retention and random.randint(1, 1000) == 1:
+    if changelog_retention and secrets.randbelow(1000) == 0:
         cutoff = timezone.now() - timedelta(days=changelog_retention)
         ObjectChange.objects.filter(time__lt=cutoff).delete()
 

nautobot/extras/tables.py

@@ -1,10 +1,9 @@
-import django_tables2 as tables
 from django.conf import settings
 from django.utils.html import format_html
+import django_tables2 as tables
 from django_tables2.utils import Accessor
 from jsonschema.exceptions import ValidationError as JSONSchemaValidationError
 
-from nautobot.core.templatetags.helpers import render_boolean, render_markdown
 from nautobot.core.tables import (
     BaseTable,
     BooleanColumn,
@@ -16,6 +15,8 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
+from nautobot.core.templatetags.helpers import render_boolean, render_markdown
+
 from .choices import LogLevelChoices
 from .models import (
     ComputedField,
@@ -32,8 +33,8 @@ from .models import (
     Job as JobModel,
     JobButton,
     JobHook,
-    JobResult,
     JobLogEntry,
+    JobResult,
     Note,
     ObjectChange,
     Relationship,
@@ -49,7 +50,6 @@ from .models import (
 )
 from .registry import registry
 
-
 TAGGED_ITEM = """
 {% if value.get_absolute_url %}
     <a href="{{ value.get_absolute_url }}">{{ value }}</a>
@@ -411,8 +411,11 @@ class ExportTemplateTable(BaseTable):
 class ExternalIntegrationTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(linkify=True)
-    remote_url = tables.Column(linkify=False)
+    remote_url = tables.Column()
+    http_method = tables.Column()
     secrets_group = tables.Column(linkify=True)
+    ca_file_path = tables.Column()
+    tags = TagColumn(url_name="extras:externalintegration_list")
 
     class Meta(BaseTable.Meta):
         model = ExternalIntegration
@@ -420,17 +423,22 @@ class ExternalIntegrationTable(BaseTable):
             "pk",
             "name",
             "remote_url",
+            "http_method",
             "secrets_group",
             "verify_ssl",
             "timeout",
+            "ca_file_path",
+            "tags",
         )
         default_columns = (
             "pk",
             "name",
             "remote_url",
+            "http_method",
             "secrets_group",
             "verify_ssl",
             "timeout",
+            "tags",
         )
 
 

nautobot/extras/tasks.py

@@ -1,16 +1,15 @@
 from logging import getLogger
 
-import requests
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.db import transaction
 from jinja2.exceptions import TemplateError
+import requests
 
 from nautobot.core.celery import nautobot_task
 from nautobot.extras.choices import CustomFieldTypeChoices, ObjectChangeActionChoices
 from nautobot.extras.utils import generate_signature
 
-
 logger = getLogger("nautobot.extras.tasks")
 
 

nautobot/extras/templates/extras/configcontext_edit.html

@@ -8,7 +8,7 @@
             {% render_field form.name %}
             {% render_field form.weight %}
             {% render_field form.description %}
-            {% render_field form.schema %}
+            {% render_field form.config_context_schema %}
             {% render_field form.is_active %}
         </div>
     </div>

nautobot/extras/templates/extras/customfield_edit.html

@@ -36,21 +36,17 @@
         <div class="panel-heading"><strong>Custom Field Choices</strong></div>
         <div class="panel-body">
             {% if choices.errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        Please correct the error(s) below:
+                <div class="text-danger">
+                    Please correct the error(s) below:
 
-                        {% for choice in choices.forms %}
-                            {% if choice.errors %}
-                                {% for error in choice.errors.values %}{{ error }}{% endfor %}
-                            {% endif %}
-                        {% endfor %}
-                    </div>
+                    {% for choice in choices.forms %}
+                        {% if choice.errors %}
+                            {% for error in choice.errors.values %}{{ error }}{% endfor %}
+                        {% endif %}
+                    {% endfor %}
                 </div>
             {% endif %}
             {{ choices.non_field_errors }}
-            <div class="form-group{% if field.errors %} has-error{% endif %}">
             <table class="table" id="custom-field-choices">
               {{ choices.management_form }}
               {% for choice in choices.forms %}
@@ -87,7 +83,6 @@
                     </tr>
                {% endfor %}
             </table>
-            </div>
         </div>
     </div>
     {% include 'inc/extras_features_edit_form_fields.html' %}