fix(dcim): Avoid clearing scope on clone

ScopedForm._set_scoped_values() cleared initial['scope'] whenever the
scope_type differed from the instance value. During cloning (unsaved
instance), this runs on the initial GET and wipes the pre-filled scope,
forcing the user to re-select it.

Only clear the scope when editing an existing object (instance.pk set)
and the scope type has actually changed.

Fixes #21202

netbox/dcim/forms/mixins.py

@@ -75,7 +75,7 @@ class ScopedForm(forms.Form):
             except ObjectDoesNotExist:
                 pass
 
-            if self.instance and scope_type_id != self.instance.scope_type_id:
+            if self.instance and self.instance.pk and scope_type_id != self.instance.scope_type_id:
                 self.initial['scope'] = None
 
         else:

netbox/extras/events.py

@@ -86,7 +86,7 @@ def enqueue_event(queue, instance, request, event_type):
 
 
 def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None):
-    user = None  # To be resolved from the username if needed
+    user = User.objects.get(username=username) if username else None
 
     for event_rule in event_rules:
 
@@ -134,10 +134,6 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
             # Resolve the script from action parameters
             script = event_rule.action_object.python_class()
 
-            # Retrieve the User if not already resolved
-            if user is None:
-                user = User.objects.get(username=username)
-
             # Enqueue a Job to record the script's execution
             from extras.jobs import ScriptJob
             params = {

netbox/netbox/navigation/menu.py

@@ -409,10 +409,60 @@ ADMIN_MENU = Menu(
         MenuGroup(
             label=_('Authentication'),
             items=(
-                get_model_item('users', 'user', _('Users')),
-                get_model_item('users', 'group', _('Groups')),
-                get_model_item('users', 'token', _('API Tokens')),
-                get_model_item('users', 'objectpermission', _('Permissions'), actions=['add']),
+                MenuItem(
+                    link='users:user_list',
+                    link_text=_('Users'),
+                    staff_only=True,
+                    permissions=['users.view_user'],
+                    buttons=(
+                        MenuItemButton(
+                            link='users:user_add',
+                            title='Add',
+                            icon_class='mdi mdi-plus-thick',
+                            permissions=['users.add_user']
+                        ),
+                        MenuItemButton(
+                            link='users:user_bulk_import',
+                            title='Import',
+                            icon_class='mdi mdi-upload',
+                            permissions=['users.add_user']
+                        )
+                    )
+                ),
+                MenuItem(
+                    link='users:group_list',
+                    link_text=_('Groups'),
+                    staff_only=True,
+                    permissions=['users.view_group'],
+                    buttons=(
+                        MenuItemButton(
+                            link='users:group_add',
+                            title='Add',
+                            icon_class='mdi mdi-plus-thick',
+                            permissions=['users.add_group']
+                        ),
+                        MenuItemButton(
+                            link='users:group_bulk_import',
+                            title='Import',
+                            icon_class='mdi mdi-upload',
+                            permissions=['users.add_group']
+                        )
+                    )
+                ),
+                MenuItem(
+                    link='users:token_list',
+                    link_text=_('API Tokens'),
+                    staff_only=True,
+                    permissions=['users.view_token'],
+                    buttons=get_model_buttons('users', 'token')
+                ),
+                MenuItem(
+                    link='users:objectpermission_list',
+                    link_text=_('Permissions'),
+                    staff_only=True,
+                    permissions=['users.view_objectpermission'],
+                    buttons=get_model_buttons('users', 'objectpermission', actions=['add'])
+                ),
             ),
         ),
         MenuGroup(