nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/users/templates/users/preferences.html

@@ -2,56 +2,66 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}User Preferences{% endblock %}
-
 {% block usercontent %}
-    {% if preferences %}
-        <form method="post" action="">
-            {% csrf_token %}
-            <table class="table table-striped">
-                <thead>
-                    <tr>
-                        <th><input type="checkbox" class="toggle" title="Toggle all"></th>
-                        <th>Preference</th>
-                        <th>Value</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for key, value in preferences.items %}
-                        <tr>
-                            <td class="min-width"><input type="checkbox" name="pk" value="{{ key }}"></td>
-                            <td><samp>{{ key }}</samp></td>
-                            <td><samp>{{ value }}</samp></td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-            <button type="submit" class="btn btn-danger">
-                <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Clear Selected
-            </button>
-        </form>
-    {% else %}
-        <h3 class="text-muted text-center">No preferences found</h3>
-    {% endif %}
-
-    <form action="" method="post" class="form form-horizontal" style="margin-top: 30px;">
+    <form method="post" action="" class="h-100 vstack">
         {% csrf_token %}
-        {% if form.non_field_errors %}
-            <div class="panel panel-danger">
-                <div class="panel-heading"><strong>Errors</strong></div>
-                <div class="panel-body">
-                    {{ form.non_field_errors }}
+        <div class="row align-content-start flex-fill">
+            {% if preferences %}
+                <div class="col-md-8 offset-md-2">
+                    <div class="card">
+                        <div class="table-responsive">
+                            <table class="table table-striped">
+                                <thead>
+                                    <tr>
+                                        <th><input type="checkbox" class="toggle" title="Toggle all"></th>
+                                        <th>Preference</th>
+                                        <th>Value</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for key, value in preferences.items %}
+                                        <tr>
+                                            <td class="nb-w-0"><input type="checkbox" name="pk" value="{{ key }}"></td>
+                                            <td><samp>{{ key }}</samp></td>
+                                            <td><samp>{{ value }}</samp></td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <button type="submit" class="btn btn-danger mb-16">
+                        <span class="mdi mdi-trash-can-outline me-4" aria-hidden="true"></span><!--
+                        -->Clear Selected
+                    </button>
+                </div>
+            {% else %}
+                <h3 class="col-md-8 offset-md-2 mb-16 text-center text-secondary">No preferences found</h3>
+            {% endif %}
+            <div class="col-md-8 offset-md-2">
+                {% if form.non_field_errors %}
+                    <div class="card border-danger">
+                        <div class="card-header bg-danger-subtle border-danger text-body">
+                            <strong>Errors</strong>
+                        </div>
+                        <div class="card-body">
+                            {{ form.non_field_errors }}
+                        </div>
+                    </div>
+                {% endif %}
+                <div class="card">
+                    <div class="card-header"><strong>Preference Settings</strong></div>
+                    <div class="card-body">
+                        {% render_field form.timezone %}
+                    </div>
                 </div>
-            </div>
-        {% endif %}
-        <div class="panel panel-default">
-            <div class="panel-heading"><strong>Preference Settings</strong></div>
-            <div class="panel-body">
-                {% render_field form.timezone %}
             </div>
         </div>
-        <div class="text-right">
-            <button type="submit" name="_update_preference_form" class="btn btn-primary">Update</button>
+        <div class="nb-form-sticky-footer">
+            <button type="submit" name="_update_preference_form" class="btn btn-primary">
+                <span aria-hidden="true" class="mdi mdi-check me-4"></span><!--
+                -->Update
+            </button>
         </div>
     </form>
 {% endblock %}

nautobot/users/templates/users/profile.html

@@ -1,19 +1,50 @@
 {% extends 'users/base.html' %}
 {% load helpers %}
 
-{% block title %}User Profile{% endblock %}
-
 {% block usercontent %}
-    <small class="text-muted">User login</small>
-    <h5>{{ request.user.username }}</h5>
-    <small class="text-muted">Full name</small>
-    <h5>{{ request.user.first_name }} {{ request.user.last_name }}</h5>
-    <small class="text-muted">Email</small>
-    <h5>{{ request.user.email }}</h5>
-    <small class="text-muted">Registered</small>
-    <h5>{{ request.user.date_joined }}</h5>
-    <small class="text-muted">Groups</small>
-    <h5>{{ request.user.groups.all|join:', ' }}</h5>
-    <small class="text-muted">Admin access</small>
-    <h5>{{ request.user.is_staff|yesno|capfirst }}</h5>
+    <div class="row align-content-start flex-fill">
+        <div class="col-md-8 offset-md-2">
+            <div class="card">
+                <div class="card-header">
+                    <strong>User Profile</strong>
+                </div>
+                <div class="collapse show">
+                    <table class="table table-hover attr-table">
+                        <tr>
+                            <td>User login</td>
+                            <td>{{ request.user.username }}</td>
+                        </tr>
+                        <tr>
+                            <td>Full name</td>
+                            {% if request.user.first_name or request.user.last_name %}
+                                <td>{{ request.user.first_name }} {{ request.user.last_name }}</td>
+                            {% else %}
+                                <td>{{ None|placeholder }}</td>
+                            {% endif %}
+                        </tr>
+                        <tr>
+                            <td>Email</td>
+                            <td>{{ request.user.email|hyperlinked_email }}</td>
+                        </tr>
+                        <tr>
+                            <td>Registered</td>
+                            <td>{{ request.user.date_joined|date:settings.SHORT_DATETIME_FORMAT }}</td>
+                        </tr>
+                        <tr>
+                            <td>Groups</td>
+                            <td>{{ request.user.groups.all|join:', '|placeholder }}</td>
+                        </tr>
+                        <tr>
+                            <td>Admin access</td>
+                            <td>{{ request.user.is_staff|render_boolean }}</td>
+                        </tr>
+                        <tr>
+                            <td>Superuser access</td>
+                            <td>{{ request.user.is_superuser|render_boolean }}</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
 {% endblock %}

nautobot/users/tests/test_api.py

@@ -348,6 +348,10 @@ class TokenTest(APIViewTestCases.APIViewTestCase):
 
 class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
     model = ObjectPermission
+    validation_excluded_fields = [
+        "groups",  # M2M field, excluded by default
+        "users",  # M2M field, excluded by default
+    ]
 
     @classmethod
     def setUpTestData(cls):

nautobot/users/urls.py

@@ -12,6 +12,8 @@ router = NautobotUIViewSetRouter()
 urlpatterns = [
     path("profile/", views.ProfileView.as_view(), name="profile"),
     path("preferences/", views.UserConfigView.as_view(), name="preferences"),
+    path("navbar-favorites/", views.UserNavbarFavoritesAddView.as_view(), name="navbar_favorites_add"),
+    path("navbar-favorites/delete/", views.UserNavbarFavoritesDeleteView.as_view(), name="navbar_favorites_delete"),
     path("password/", views.ChangePasswordView.as_view(), name="change_password"),
     path("api-tokens/", views.TokenListView.as_view(), name="token_list"),
     path("api-tokens/add/", views.TokenEditView.as_view(), name="token_add"),

nautobot/users/views.py

@@ -1,3 +1,4 @@
+from http import HTTPStatus
 import logging
 
 from django.contrib import messages
@@ -19,10 +20,20 @@ from django.views.generic import View
 
 from nautobot.core.events import publish_event
 from nautobot.core.forms import ConfirmationForm
+from nautobot.core.ui.titles import Titles
 from nautobot.core.views.generic import GenericView
 from nautobot.users.utils import serialize_user_without_config_and_views
 
-from .forms import AdvancedProfileSettingsForm, LoginForm, PasswordChangeForm, PreferenceProfileSettingsForm, TokenForm
+from ..core.views.mixins import GetReturnURLMixin
+from .forms import (
+    AdvancedProfileSettingsForm,
+    LoginForm,
+    NavbarFavoritesAddForm,
+    NavbarFavoritesRemoveForm,
+    PasswordChangeForm,
+    PreferenceProfileSettingsForm,
+    TokenForm,
+)
 from .models import Token
 
 #
@@ -53,6 +64,7 @@ class LoginView(View):
             self.template_name,
             {
                 "form": form,
+                "title": "Login",
             },
         )
 
@@ -80,6 +92,7 @@ class LoginView(View):
             self.template_name,
             {
                 "form": form,
+                "title": "Login",
             },
         )
 
@@ -132,6 +145,7 @@ def is_django_auth_user(request):
 
 class ProfileView(GenericView):
     template_name = "users/profile.html"
+    view_titles = Titles(titles={"*": "User Profile"})
 
     def get(self, request):
         return render(
@@ -140,24 +154,31 @@ class ProfileView(GenericView):
             {
                 "is_django_auth_user": is_django_auth_user(request),
                 "active_tab": "profile",
+                "view_titles": self.get_view_titles(),
+                "breadcrumbs": self.get_breadcrumbs(),
             },
         )
 
 
 class UserConfigView(GenericView):
     template_name = "users/preferences.html"
+    view_titles = Titles(titles={"*": "User Preferences"})
 
     def get(self, request):
         tzname = request.user.get_config("timezone", get_default_timezone_name())
         form = PreferenceProfileSettingsForm(initial={"timezone": tzname})
+        preferences = request.user.all_config()
+
         return render(
             request,
             self.template_name,
             {
-                "preferences": request.user.all_config(),
+                "preferences": preferences,
                 "form": form,
                 "active_tab": "preferences",
                 "is_django_auth_user": is_django_auth_user(request),
+                "view_titles": self.get_view_titles(),
+                "breadcrumbs": self.get_breadcrumbs(),
             },
         )
 
@@ -195,8 +216,46 @@ class UserConfigView(GenericView):
             return redirect("user:preferences")
 
 
+class UserNavbarFavoritesAddView(GetReturnURLMixin, GenericView):
+    def post(self, request):
+        if request.headers.get("HX-Request", False):
+            form = NavbarFavoritesAddForm(request.POST)
+            if form.is_valid():
+                navbar_favorites = request.user.get_config("navbar_favorites", [])
+                navbar_favorites.append(form.cleaned_data)
+                navbar_favorites = sorted(navbar_favorites, key=lambda d: d.get("name", ""))
+                request.user.set_config("navbar_favorites", navbar_favorites, commit=True)
+
+                return render(
+                    request,
+                    "inc/nav_menu.html",
+                    status=HTTPStatus.CREATED,
+                )
+
+        return redirect(self.get_return_url(request))
+
+
+class UserNavbarFavoritesDeleteView(GetReturnURLMixin, GenericView):
+    def post(self, request):
+        if request.headers.get("HX-Request", False):
+            form = NavbarFavoritesRemoveForm(request.POST)
+            if form.is_valid():
+                navbar_favorites = request.user.get_config("navbar_favorites", [])
+                navbar_favorites = [item for item in navbar_favorites if item.get("link") != form.cleaned_data["link"]]
+                request.user.set_config("navbar_favorites", navbar_favorites, commit=True)
+
+                return render(
+                    request,
+                    "inc/nav_menu.html",
+                    status=HTTPStatus.OK,
+                )
+
+        return redirect(self.get_return_url(request))
+
+
 class ChangePasswordView(GenericView):
     template_name = "users/change_password.html"
+    view_titles = Titles(titles={"*": "Change Password"})
 
     RESTRICTED_NOTICE = "Remotely authenticated user credentials cannot be changed within Nautobot."
 
@@ -218,6 +277,8 @@ class ChangePasswordView(GenericView):
                 "form": form,
                 "active_tab": "change_password",
                 "is_django_auth_user": is_django_auth_user(request),
+                "view_titles": self.get_view_titles(),
+                "breadcrumbs": self.get_breadcrumbs(),
             },
         )
 
@@ -256,6 +317,8 @@ class ChangePasswordView(GenericView):
 
 
 class TokenListView(GenericView):
+    view_titles = Titles(titles={"*": "API Tokens"})
+
     def get(self, request):
         tokens = Token.objects.filter(user=request.user)
 
@@ -266,6 +329,8 @@ class TokenListView(GenericView):
                 "tokens": tokens,
                 "active_tab": "api_tokens",
                 "is_django_auth_user": is_django_auth_user(request),
+                "view_titles": self.get_view_titles(),
+                "breadcrumbs": self.get_breadcrumbs(),
             },
         )
 
@@ -375,6 +440,7 @@ class TokenDeleteView(GenericView):
 
 class AdvancedProfileSettingsEditView(GenericView):
     template_name = "users/advanced_settings_edit.html"
+    view_titles = Titles(titles={"*": "Advanced Settings"})
 
     def get(self, request):
         silk_record_requests = request.session.get("silk_record_requests", False)
@@ -388,6 +454,8 @@ class AdvancedProfileSettingsEditView(GenericView):
                 "active_tab": "advanced_settings",
                 "return_url": reverse("user:advanced_settings_edit"),
                 "is_django_auth_user": is_django_auth_user(request),
+                "view_titles": self.get_view_titles(),
+                "breadcrumbs": self.get_breadcrumbs(),
             },
         )
 

nautobot/virtualization/api/views.py

@@ -36,7 +36,7 @@ class ClusterGroupViewSet(NautobotModelViewSet):
 
 class ClusterViewSet(NautobotModelViewSet):
     queryset = Cluster.objects.annotate(
-        device_count=count_related(Device, "cluster"),
+        device_count=count_related(Device, "clusters", distinct=True),
         virtualmachine_count=count_related(VirtualMachine, "cluster"),
     )
     serializer_class = serializers.ClusterSerializer

nautobot/virtualization/filters.py

@@ -3,6 +3,7 @@ import django_filters
 
 from nautobot.core.filters import (
     BaseFilterSet,
+    ModelMultipleChoiceFilter,
     MultiValueCharFilter,
     MultiValueMACAddressFilter,
     NameSearchFilterSet,
@@ -39,7 +40,6 @@ class ClusterTypeFilterSet(NautobotFilterSet, NameSearchFilterSet):
     clusters = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Cluster.objects.all(),
         to_field_name="name",
-        label="Clusters (name or ID)",
     )
     has_clusters = RelatedMembershipBooleanFilter(
         field_name="clusters",
@@ -55,7 +55,6 @@ class ClusterGroupFilterSet(NautobotFilterSet, NameSearchFilterSet):
     clusters = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Cluster.objects.all(),
         to_field_name="name",
-        label="Clusters (name or ID)",
     )
     has_clusters = RelatedMembershipBooleanFilter(
         field_name="clusters",
@@ -75,7 +74,8 @@ class ClusterFilterSet(NautobotFilterSet, LocatableModelFilterSetMixin, TenancyM
         },
     )
     devices = NaturalKeyOrPKMultipleChoiceFilter(
-        to_field_name="name", queryset=Device.objects.all(), label="Devices (name or ID)"
+        to_field_name="name",
+        queryset=Device.objects.all(),
     )
     has_devices = RelatedMembershipBooleanFilter(
         field_name="devices",
@@ -84,30 +84,28 @@ class ClusterFilterSet(NautobotFilterSet, LocatableModelFilterSetMixin, TenancyM
     virtual_machines = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=VirtualMachine.objects.all(),
-        label="Virtual machines (name or ID)",
     )
     has_virtual_machines = RelatedMembershipBooleanFilter(
         field_name="virtual_machines",
         label="Has virtual machines",
     )
-    cluster_group_id = django_filters.ModelMultipleChoiceFilter(
+    cluster_group_id = ModelMultipleChoiceFilter(
         field_name="cluster_group",
         queryset=ClusterGroup.objects.all(),
-        label="Parent group (ID) - Deprecated (use group filter)",
+        label="Parent cluster group (ID) - Deprecated (use cluster_group filter)",
     )
     cluster_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ClusterGroup.objects.all(),
-        label="Parent group (ID or name)",
+        label="Parent cluster group (ID or name)",
         to_field_name="name",
     )
-    cluster_type_id = django_filters.ModelMultipleChoiceFilter(
+    cluster_type_id = ModelMultipleChoiceFilter(
         field_name="cluster_type",
         queryset=ClusterType.objects.all(),
-        label="Cluster type (ID) - Deprecated (use type filter)",
+        label="Cluster type (ID) - Deprecated (use cluster_type filter)",
     )
     cluster_type = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ClusterType.objects.all(),
-        label="Cluster type (ID or name)",
         to_field_name="name",
     )
 
@@ -129,7 +127,7 @@ class VirtualMachineFilterSet(
             "comments": "icontains",
         },
     )
-    cluster_group_id = django_filters.ModelMultipleChoiceFilter(
+    cluster_group_id = ModelMultipleChoiceFilter(
         field_name="cluster__cluster_group",
         queryset=ClusterGroup.objects.all(),
         label="Cluster group (ID) - Deprecated (use cluster_group filter)",
@@ -137,10 +135,9 @@ class VirtualMachineFilterSet(
     cluster_group = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="cluster__cluster_group",
         queryset=ClusterGroup.objects.all(),
-        label="Cluster group (ID or name)",
         to_field_name="name",
     )
-    cluster_type_id = django_filters.ModelMultipleChoiceFilter(
+    cluster_type_id = ModelMultipleChoiceFilter(
         field_name="cluster__cluster_type",
         queryset=ClusterType.objects.all(),
         label="Cluster type (ID) - Deprecated (use cluster_type filter)",
@@ -148,17 +145,15 @@ class VirtualMachineFilterSet(
     cluster_type = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="cluster__cluster_type",
         queryset=ClusterType.objects.all(),
-        label="Cluster type (ID or name)",
         to_field_name="name",
     )
-    cluster_id = django_filters.ModelMultipleChoiceFilter(
+    cluster_id = ModelMultipleChoiceFilter(
         queryset=Cluster.objects.all(),
         label="Cluster (ID) - Deprecated (use cluster filter)",
     )
     cluster = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Cluster.objects.all(),
         to_field_name="name",
-        label="Cluster (name or ID)",
     )
     location = TreeNodeMultipleChoiceFilter(
         prefers_id=True,
@@ -167,14 +162,13 @@ class VirtualMachineFilterSet(
         to_field_name="name",
         label="Location (name or ID)",
     )
-    platform_id = django_filters.ModelMultipleChoiceFilter(
+    platform_id = ModelMultipleChoiceFilter(
         queryset=Platform.objects.all(),
         label="Platform (ID) - Deprecated (use platform filter)",
     )
     platform = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Platform.objects.all(),
         to_field_name="name",
-        label="Platform (ID or name)",
     )
     mac_address = MultiValueMACAddressFilter(
         field_name="interfaces__mac_address",
@@ -193,14 +187,16 @@ class VirtualMachineFilterSet(
         label="Primary IPv6 Address (address or ID)",
     )
     services = NaturalKeyOrPKMultipleChoiceFilter(
-        to_field_name="name", queryset=Service.objects.all(), label="Services (name or ID)"
+        to_field_name="name",
+        queryset=Service.objects.all(),
     )
     has_services = RelatedMembershipBooleanFilter(
         field_name="services",
         label="Has services",
     )
     interfaces = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=VMInterface.objects.all(), to_field_name="name", label="Interfaces (name or ID)"
+        queryset=VMInterface.objects.all(),
+        to_field_name="name",
     )
     has_interfaces = RelatedMembershipBooleanFilter(
         field_name="interfaces",
@@ -213,7 +209,6 @@ class VirtualMachineFilterSet(
     software_image_files = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareImageFile.objects.all(),
         to_field_name="image_file_name",
-        label="Software image files (image file name or ID)",
     )
     has_software_version = RelatedMembershipBooleanFilter(
         field_name="software_version",
@@ -222,7 +217,6 @@ class VirtualMachineFilterSet(
     software_version = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareVersion.objects.all(),
         to_field_name="version",
-        label="Software version (version or ID)",
     )
     ip_addresses = MultiValueCharFilter(
         method="filter_ip_addresses",
@@ -285,7 +279,7 @@ class VMInterfaceFilterSet(
 ):
     q = SearchFilter(filter_predicates={"name": "icontains"})
 
-    cluster_id = django_filters.ModelMultipleChoiceFilter(
+    cluster_id = ModelMultipleChoiceFilter(
         field_name="virtual_machine__cluster",
         queryset=Cluster.objects.all(),
         label="Cluster (ID) - Deprecated (use cluster filter)",
@@ -294,9 +288,8 @@ class VMInterfaceFilterSet(
         field_name="virtual_machine__cluster",
         queryset=Cluster.objects.all(),
         to_field_name="name",
-        label="Cluster (ID or name)",
     )
-    virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
+    virtual_machine_id = ModelMultipleChoiceFilter(
         field_name="virtual_machine",
         queryset=VirtualMachine.objects.all(),
         label="Virtual machine (ID) - Deprecated (use virtual_machine filter)",
@@ -304,17 +297,14 @@ class VMInterfaceFilterSet(
     virtual_machine = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VirtualMachine.objects.all(),
         to_field_name="name",
-        label="Virtual machine (ID or name)",
     )
     parent_interface = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=VMInterface.objects.all(),
-        label="Parent interface (name or ID)",
     )
     child_interfaces = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=VMInterface.objects.all(),
-        label="Child interfaces (name or ID)",
     )
     has_child_interfaces = RelatedMembershipBooleanFilter(
         field_name="child_interfaces",
@@ -323,12 +313,10 @@ class VMInterfaceFilterSet(
     bridge = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=VMInterface.objects.all(),
-        label="Bridge interface (name or ID)",
     )
     bridged_interfaces = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=VMInterface.objects.all(),
-        label="Bridged interfaces (name or ID)",
     )
     has_bridged_interfaces = RelatedMembershipBooleanFilter(
         field_name="bridged_interfaces",
@@ -341,7 +329,6 @@ class VMInterfaceFilterSet(
         prefers_id=True,
         to_field_name="vid",
         queryset=VLAN.objects.all(),
-        label="Tagged VLANs (VID or ID)",
     )
     has_tagged_vlans = RelatedMembershipBooleanFilter(
         field_name="tagged_vlans",
@@ -351,7 +338,6 @@ class VMInterfaceFilterSet(
         prefers_id=True,
         to_field_name="vid",
         queryset=VLAN.objects.all(),
-        label="Untagged VLAN (VID or ID)",
     )
     vlan_id = django_filters.CharFilter(method="filter_vlan_id", label="Any assigned VLAN (tagged or untagged)")
     ip_addresses = MultiValueCharFilter(