nautobot 2.0.0a2__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/project-static/js/forms.js

@@ -4,14 +4,16 @@
 
 // Slugify
 function slugify(s, num_chars) {
-    s = s.replace(/[^\-\.\w\s]/g, '');          // Remove unneeded chars
+    s = s.replace(/[^_A-Za-z0-9\-\s\.]/g, '');  // Remove non-ascii chars
     s = s.replace(/^[\s\.]+|[\s\.]+$/g, '');    // Trim leading/trailing spaces
     s = s.replace(/[\-\.\s]+/g, '-');           // Convert spaces and decimals to hyphens
     s = s.toLowerCase();                        // Convert to lowercase
-    // Declare `const slugify_prefer_underscores = true` globally if you want to use underscores instead of hyphens
-    if (typeof slugify_prefer_underscores !== "undefined") {
-        s = s.replace(/-/g, '_');
+    s = s.replace(/-/g, '_');
+
+    if (/^[^_A-Za-z]/.test(s)) {  // Slug must start with a letter or underscore only
+        s = 'a' + s;
     }
+
     return s.substring(0, num_chars);           // Trim to first num_chars chars
 }
 
@@ -88,7 +90,7 @@ function initializeSlugField(context){
     this_context = $(context);
     var slug_field = this_context.find('#id_slug');
     // If id_slug field is not to be found
-    // check if it is rename to key field like what we did for CustomField
+    // check if it is rename to key field like what we did for CustomField and Relationship
     if (slug_field.length == 0) {
         slug_field = this_context.find('#id_key');
     }
@@ -202,8 +204,8 @@ function initializeDynamicChoiceSelection(context, dropdownParent=null){
                     }
 
 
-                    // Allow for controlling the brief setting from within APISelect
-                    parameters.brief = ( $(element).is('[data-full]') ? undefined : true );
+                    // Allow for controlling the depth setting from within APISelect
+                    parameters.depth = parseInt($(element).attr('data-depth'))
 
                     // Attach any extra query parameters
                     $.each(element.attributes, function(index, attr){
@@ -287,6 +289,12 @@ function initializeDynamicChoiceSelection(context, dropdownParent=null){
                         else {
                             results[idx] = record;
                         }
+                        // DynamicGroupSerializer has a `children` field which fits an inappropriate if condition
+                        // in select2.min.js, which will result in the incorrect rendering of DynamicGroup DynamicChoiceField.
+                        // So we nullify the field here since we do not need this field.
+                        if (record.url.includes("dynamic-groups")){
+                            record.children = undefined;
+                        }
 
                         return results;
                     },Object.create(null));
@@ -372,7 +380,6 @@ function initializeTags(context, dropdownParent=null){
                 var offset = (params.page - 1) * 50 || 0;
                 var parameters = {
                     q: params.term,
-                    brief: 1,
                     limit: 50,
                     offset: offset,
                 };
@@ -533,7 +540,7 @@ function initializeDynamicFilterForm(context){
 
         if(lookup_type_val){
             $.ajax({
-                url: `/api/core/filterset-fields/lookup-value-dom-element/?field_name=${lookup_type_val}&content_type=${contenttype}`,
+                url: `/api/ui/core/filterset-fields/lookup-value-dom-element/?field_name=${lookup_type_val}&content_type=${contenttype}`,
                 async: true,
                 contentType: 'application/json',
                 dataType: 'json',

nautobot/project-static/js/theme.js

@@ -130,4 +130,9 @@ function setSystemThemeActive() {
     tdSystemTheme.classList.add("active-theme");
     tdDarkTheme.classList.remove("active-theme");
     tdLightTheme.classList.remove("active-theme");
+}
+
+function viewNewUI() {
+    document.cookie = "newui=1; path=/";
+    document.location.reload(true);
 }

nautobot/tenancy/api/serializers.py

@@ -4,36 +4,21 @@ from nautobot.core.api import TreeModelSerializerMixin
 from nautobot.extras.api.serializers import NautobotModelSerializer, TaggedModelSerializerMixin
 from nautobot.tenancy.models import Tenant, TenantGroup
 
-# Not all of these variable(s) are not actually used anywhere in this file, but required for the
-# automagically replacing a Serializer with its corresponding NestedSerializer.
-from .nested_serializers import NestedTenantGroupSerializer, NestedTenantSerializer  # noqa: F401
-
 #
 # Tenants
 #
 
 
 class TenantGroupSerializer(NautobotModelSerializer, TreeModelSerializerMixin):
-    url = serializers.HyperlinkedIdentityField(view_name="tenancy-api:tenantgroup-detail")
-    parent = NestedTenantGroupSerializer(required=False, allow_null=True)
     tenant_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = TenantGroup
-        fields = [
-            "url",
-            "name",
-            "slug",
-            "parent",
-            "description",
-            "tenant_count",
-            "tree_depth",
-        ]
+        fields = "__all__"
+        list_display_fields = ["name", "tenant_count", "description", "actions"]
 
 
 class TenantSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
-    url = serializers.HyperlinkedIdentityField(view_name="tenancy-api:tenant-detail")
-    tenant_group = NestedTenantGroupSerializer(required=False)
     circuit_count = serializers.IntegerField(read_only=True)
     device_count = serializers.IntegerField(read_only=True)
     ipaddress_count = serializers.IntegerField(read_only=True)
@@ -46,20 +31,5 @@ class TenantSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
 
     class Meta:
         model = Tenant
-        fields = [
-            "url",
-            "name",
-            "slug",
-            "tenant_group",
-            "description",
-            "comments",
-            "circuit_count",
-            "device_count",
-            "ipaddress_count",
-            "prefix_count",
-            "rack_count",
-            "virtualmachine_count",
-            "vlan_count",
-            "vrf_count",
-            "cluster_count",
-        ]
+        fields = "__all__"
+        list_display_fields = ["name", "tenant_group", "description"]

nautobot/tenancy/api/urls.py

@@ -1,4 +1,4 @@
-from nautobot.core.api import OrderedDefaultRouter
+from nautobot.core.api.routers import OrderedDefaultRouter
 from . import views
 
 

nautobot/tenancy/filters/__init__.py

@@ -28,11 +28,13 @@ __all__ = (
 class TenantGroupFilterSet(NautobotFilterSet, NameSlugSearchFilterSet):
     parent = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=TenantGroup.objects.all(),
-        label="Parent tenant group (slug or ID)",
+        label="Parent tenant group (name or ID)",
+        to_field_name="name",
     )
     children = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=TenantGroup.objects.all(),
-        label="Children (slug or ID)",
+        label="Children (name or ID)",
+        to_field_name="name",
     )
     has_children = RelatedMembershipBooleanFilter(
         field_name="children",
@@ -40,7 +42,8 @@ class TenantGroupFilterSet(NautobotFilterSet, NameSlugSearchFilterSet):
     )
     tenants = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Tenant.objects.all(),
-        label="Tenants (slug or ID)",
+        label="Tenants (name or ID)",
+        to_field_name="name",
     )
     has_tenants = RelatedMembershipBooleanFilter(
         field_name="tenants",
@@ -49,14 +52,13 @@ class TenantGroupFilterSet(NautobotFilterSet, NameSlugSearchFilterSet):
 
     class Meta:
         model = TenantGroup
-        fields = ["id", "name", "slug", "description"]
+        fields = ["id", "name", "description"]
 
 
 class TenantFilterSet(NautobotFilterSet):
     q = SearchFilter(
         filter_predicates={
             "name": "icontains",
-            "slug": "icontains",
             "description": "icontains",
             "comments": "icontains",
         },
@@ -64,7 +66,8 @@ class TenantFilterSet(NautobotFilterSet):
     tenant_group = TreeNodeMultipleChoiceFilter(
         queryset=TenantGroup.objects.all(),
         field_name="tenant_group",
-        label="Tenant group (slug or ID)",
+        label="Tenant group (name or ID)",
+        to_field_name="name",
     )
     circuits = django_filters.ModelMultipleChoiceFilter(
         queryset=Circuit.objects.all(),
@@ -176,7 +179,6 @@ class TenantFilterSet(NautobotFilterSet):
             "description",
             "id",
             "name",
-            "slug",
             "tags",
         ]
 

nautobot/tenancy/filters/mixins.py

@@ -12,7 +12,7 @@ class TenancyModelFilterSetMixin(django_filters.FilterSet):
     tenant_group = TreeNodeMultipleChoiceFilter(
         queryset=TenantGroup.objects.all(),
         field_name="tenant__tenant_group",
-        to_field_name="slug",
+        to_field_name="name",
         label="Tenant Group (slug or ID)",
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
@@ -21,5 +21,6 @@ class TenancyModelFilterSetMixin(django_filters.FilterSet):
     )
     tenant = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Tenant.objects.all(),
-        label="Tenant (slug or ID)",
+        to_field_name="name",
+        label="Tenant (name or ID)",
     )

nautobot/tenancy/forms.py

@@ -2,15 +2,12 @@ from django import forms
 
 from nautobot.core.forms import (
     CommentField,
-    CSVModelChoiceField,
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
-    SlugField,
     TagFilterField,
 )
 from nautobot.extras.forms import (
     NautobotFilterForm,
-    CustomFieldModelCSVForm,
     NautobotBulkEditForm,
     NautobotModelForm,
     TagsBulkEditFormMixin,
@@ -25,38 +22,22 @@ from .models import Tenant, TenantGroup
 
 class TenantGroupForm(NautobotModelForm):
     parent = DynamicModelChoiceField(queryset=TenantGroup.objects.all(), required=False)
-    slug = SlugField()
 
     class Meta:
         model = TenantGroup
         fields = [
             "parent",
             "name",
-            "slug",
             "description",
         ]
 
 
-class TenantGroupCSVForm(CustomFieldModelCSVForm):
-    parent = CSVModelChoiceField(
-        queryset=TenantGroup.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Parent group",
-    )
-
-    class Meta:
-        model = TenantGroup
-        fields = TenantGroup.csv_headers
-
-
 #
 # Tenants
 #
 
 
 class TenantForm(NautobotModelForm):
-    slug = SlugField()
     tenant_group = DynamicModelChoiceField(queryset=TenantGroup.objects.all(), required=False)
     comments = CommentField()
 
@@ -64,7 +45,6 @@ class TenantForm(NautobotModelForm):
         model = Tenant
         fields = (
             "name",
-            "slug",
             "tenant_group",
             "description",
             "comments",
@@ -72,19 +52,6 @@ class TenantForm(NautobotModelForm):
         )
 
 
-class TenantCSVForm(CustomFieldModelCSVForm):
-    tenant_group = CSVModelChoiceField(
-        queryset=TenantGroup.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned group",
-    )
-
-    class Meta:
-        model = Tenant
-        fields = Tenant.csv_headers
-
-
 class TenantBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=Tenant.objects.all(), widget=forms.MultipleHiddenInput())
     tenant_group = DynamicModelChoiceField(queryset=TenantGroup.objects.all(), required=False)
@@ -100,7 +67,7 @@ class TenantFilterForm(NautobotFilterForm):
     q = forms.CharField(required=False, label="Search")
     tenant_group = DynamicModelMultipleChoiceField(
         queryset=TenantGroup.objects.all(),
-        to_field_name="slug",
+        to_field_name="name",
         required=False,
         null_option="None",
     )
@@ -129,13 +96,13 @@ class TenancyForm(forms.Form):
 class TenancyFilterForm(forms.Form):
     tenant_group = DynamicModelMultipleChoiceField(
         queryset=TenantGroup.objects.all(),
-        to_field_name="slug",
+        to_field_name="name",
         required=False,
         null_option="None",
     )
     tenant = DynamicModelMultipleChoiceField(
         queryset=Tenant.objects.all(),
-        to_field_name="slug",
+        to_field_name="name",
         required=False,
         null_option="None",
         query_params={"tenant_group": "$tenant_group"},

nautobot/tenancy/migrations/0001_initial.py

@@ -8,7 +8,6 @@ import uuid
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

nautobot/tenancy/migrations/0002_auto_slug.py

@@ -5,7 +5,6 @@ import nautobot.core.models.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("tenancy", "0001_initial"),
     ]

nautobot/tenancy/migrations/0003_mptt_to_tree_queries.py

@@ -5,7 +5,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("tenancy", "0002_auto_slug"),
     ]

nautobot/tenancy/migrations/0004_change_tree_manager_on_tree_models.py

@@ -5,7 +5,6 @@ import nautobot.core.models.tree_queries
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("tenancy", "0003_mptt_to_tree_queries"),
     ]

nautobot/tenancy/migrations/0005_rename_foreign_keys_and_related_names.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("tenancy", "0004_change_tree_manager_on_tree_models"),
     ]

nautobot/tenancy/migrations/0006_created_datetime.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("tenancy", "0005_rename_foreign_keys_and_related_names"),
     ]

nautobot/tenancy/migrations/0007_remove_tenant_tenantgroup_slug.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.18 on 2023-03-15 12:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tenancy", "0006_created_datetime"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="tenant",
+            name="slug",
+        ),
+        migrations.RemoveField(
+            model_name="tenantgroup",
+            name="slug",
+        ),
+    ]

nautobot/tenancy/migrations/0008_tagsfield.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.18 on 2023-04-21 13:59
+
+from django.db import migrations
+import nautobot.core.models.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0079_tagsfield"),
+        ("tenancy", "0007_remove_tenant_tenantgroup_slug"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tenant",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+    ]

nautobot/tenancy/models.py

@@ -1,7 +1,5 @@
 from django.db import models
-from django.urls import reverse
 
-from nautobot.core.models.fields import AutoSlugField
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.tree_queries import TreeModel
 from nautobot.extras.utils import extras_features
@@ -23,28 +21,14 @@ class TenantGroup(TreeModel, OrganizationalModel):
     """
 
     name = models.CharField(max_length=100, unique=True)
-    slug = AutoSlugField(populate_from="name")
     description = models.CharField(max_length=200, blank=True)
 
-    csv_headers = ["name", "slug", "parent", "description"]
-
     class Meta:
         ordering = ["name"]
 
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("tenancy:tenantgroup", args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.parent.name if self.parent else "",
-            self.description,
-        )
-
 
 @extras_features(
     "custom_links",
@@ -60,7 +44,6 @@ class Tenant(PrimaryModel):
     """
 
     name = models.CharField(max_length=100, unique=True)
-    slug = AutoSlugField(populate_from="name")
     tenant_group = models.ForeignKey(
         to="tenancy.TenantGroup",
         on_delete=models.SET_NULL,
@@ -71,7 +54,6 @@ class Tenant(PrimaryModel):
     description = models.CharField(max_length=200, blank=True)
     comments = models.TextField(blank=True)
 
-    csv_headers = ["name", "slug", "tenant_group", "description", "comments"]
     clone_fields = [
         "tenant_group",
         "description",
@@ -82,15 +64,3 @@ class Tenant(PrimaryModel):
 
     def __str__(self):
         return self.name
-
-    def get_absolute_url(self):
-        return reverse("tenancy:tenant", args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.tenant_group.name if self.tenant_group else None,
-            self.description,
-            self.comments,
-        )

nautobot/tenancy/navigation.py

@@ -1,58 +1,25 @@
-from nautobot.core.apps import NavMenuAddButton, NavMenuGroup, NavMenuItem, NavMenuImportButton, NavMenuTab
+from nautobot.core.apps import NavMenuGroup, NavMenuItem, NavMenuTab
 
 
 menu_items = (
     NavMenuTab(
-        name="Organization",
-        weight=100,
+        name="Inventory",
         groups=(
             NavMenuGroup(
                 name="Tenancy",
                 weight=300,
                 items=(
                     NavMenuItem(
-                        link="tenancy:tenant_list",
                         name="Tenants",
                         weight=100,
-                        permissions=[
-                            "tenancy.view_tenant",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="tenancy:tenant_add",
-                                permissions=[
-                                    "tenancy.add_tag",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="tenancy:tenant_import",
-                                permissions=[
-                                    "tenancy.add_tenant",
-                                ],
-                            ),
-                        ),
+                        link="tenancy:tenant_list",
+                        permissions=["tenancy.view_tenant"],
                     ),
                     NavMenuItem(
-                        link="tenancy:tenantgroup_list",
                         name="Tenant Groups",
                         weight=200,
-                        permissions=[
-                            "tenancy.view_tenantgroup",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="tenancy:tenantgroup_add",
-                                permissions=[
-                                    "tenancy.add_tenantgroup",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="tenancy:tenantgroup_import",
-                                permissions=[
-                                    "tenancy.add_tenantgroup",
-                                ],
-                            ),
-                        ),
+                        link="tenancy:tenantgroup_list",
+                        permissions=["tenancy.view_tenantgroup"],
                     ),
                 ),
             ),

nautobot/tenancy/tables.py

@@ -55,14 +55,14 @@ class TenantGroupTable(BaseTable):
     name = tables.TemplateColumn(template_code=TREE_LINK, orderable=False, attrs={"td": {"class": "text-nowrap"}})
     tenant_count = LinkedCountColumn(
         viewname="tenancy:tenant_list",
-        url_params={"tenant_group": "slug"},
+        url_params={"tenant_group": "name"},
         verbose_name="Tenants",
     )
-    actions = ButtonsColumn(TenantGroup, pk_field="slug")
+    actions = ButtonsColumn(TenantGroup)
 
     class Meta(BaseTable.Meta):
         model = TenantGroup
-        fields = ("pk", "name", "tenant_count", "description", "slug", "actions")
+        fields = ("pk", "name", "tenant_count", "description", "actions")
         default_columns = ("pk", "name", "tenant_count", "description", "actions")
 
 
@@ -79,5 +79,5 @@ class TenantTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Tenant
-        fields = ("pk", "name", "slug", "tenant_group", "description", "tags")
+        fields = ("pk", "name", "tenant_group", "description", "tags")
         default_columns = ("pk", "name", "tenant_group", "description")

nautobot/tenancy/templates/tenancy/tenant.html

@@ -3,7 +3,7 @@
 
 {% block extra_breadcrumbs %}
                 {% if object.tenant_group %}
-                    <li><a href="{% url 'tenancy:tenant_list' %}?group={{ object.tenant_group.slug }}">{{ object.tenant_group }}</a></li>
+                    <li><a href="{% url 'tenancy:tenant_list' %}?group={{ object.tenant_group.name }}">{{ object.tenant_group }}</a></li>
                 {% endif %}
 {% endblock extra_breadcrumbs %}
 
@@ -44,47 +44,47 @@
             </div>
             <div class="row panel-body">
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'dcim:location_list' %}?tenant={{ object.slug }}" class="btn {% if stats.location_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.location_count }}</a></h2>
+                    <h2><a href="{% url 'dcim:location_list' %}?tenant={{ object.name }}" class="btn {% if stats.location_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.location_count }}</a></h2>
                     <p>Locations</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'dcim:rack_list' %}?tenant={{ object.slug }}" class="btn {% if stats.rack_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rack_count }}</a></h2>
+                    <h2><a href="{% url 'dcim:rack_list' %}?tenant={{ object.name }}" class="btn {% if stats.rack_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rack_count }}</a></h2>
                     <p>Racks</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'dcim:rackreservation_list' %}?tenant={{ object.slug }}" class="btn {% if stats.rackreservation_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rackreservation_count }}</a></h2>
+                    <h2><a href="{% url 'dcim:rackreservation_list' %}?tenant={{ object.name }}" class="btn {% if stats.rackreservation_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rackreservation_count }}</a></h2>
                     <p>Rack reservations</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'dcim:device_list' %}?tenant={{ object.slug }}" class="btn {% if stats.device_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.device_count }}</a></h2>
+                    <h2><a href="{% url 'dcim:device_list' %}?tenant={{ object.name }}" class="btn {% if stats.device_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.device_count }}</a></h2>
                     <p>Devices</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'ipam:vrf_list' %}?tenant={{ object.slug }}" class="btn {% if stats.vrf_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vrf_count }}</a></h2>
+                    <h2><a href="{% url 'ipam:vrf_list' %}?tenant={{ object.name }}" class="btn {% if stats.vrf_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vrf_count }}</a></h2>
                     <p>VRFs</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'ipam:prefix_list' %}?tenant={{ object.slug }}" class="btn {% if stats.prefix_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.prefix_count }}</a></h2>
+                    <h2><a href="{% url 'ipam:prefix_list' %}?tenant={{ object.name }}" class="btn {% if stats.prefix_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.prefix_count }}</a></h2>
                     <p>Prefixes</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'ipam:ipaddress_list' %}?tenant={{ object.slug }}" class="btn {% if stats.ipaddress_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.ipaddress_count }}</a></h2>
+                    <h2><a href="{% url 'ipam:ipaddress_list' %}?tenant={{ object.name }}" class="btn {% if stats.ipaddress_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.ipaddress_count }}</a></h2>
                     <p>IP addresses</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'ipam:vlan_list' %}?tenant={{ object.slug }}" class="btn {% if stats.vlan_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vlan_count }}</a></h2>
+                    <h2><a href="{% url 'ipam:vlan_list' %}?tenant={{ object.name }}" class="btn {% if stats.vlan_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vlan_count }}</a></h2>
                     <p>VLANs</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'circuits:circuit_list' %}?tenant={{ object.slug }}" class="btn {% if stats.circuit_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.circuit_count }}</a></h2>
+                    <h2><a href="{% url 'circuits:circuit_list' %}?tenant={{ object.name }}" class="btn {% if stats.circuit_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.circuit_count }}</a></h2>
                     <p>Circuits</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'virtualization:virtualmachine_list' %}?tenant={{ object.slug }}" class="btn {% if stats.virtualmachine_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.virtualmachine_count }}</a></h2>
+                    <h2><a href="{% url 'virtualization:virtualmachine_list' %}?tenant={{ object.name }}" class="btn {% if stats.virtualmachine_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.virtualmachine_count }}</a></h2>
                     <p>Virtual machines</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'virtualization:cluster_list' %}?tenant={{ object.slug }}" class="btn {% if stats.cluster_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.cluster_count }}</a></h2>
+                    <h2><a href="{% url 'virtualization:cluster_list' %}?tenant={{ object.name }}" class="btn {% if stats.cluster_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.cluster_count }}</a></h2>
                     <p>Clusters</p>
                 </div>
             </div>