From 7e6b1bbd79e825d94468fcfe94ec3b0be9238866 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 6 Jun 2025 12:26:05 -0400
Subject: [PATCH] Fixes #19659: Populate initial device/VM selection for 'add a
 service' button

---
 netbox/ipam/forms/model_forms.py                    | 2 +-
 netbox/templates/dcim/device.html                   | 2 +-
 netbox/templates/virtualization/virtualmachine.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py
index 66674a749..83bb42a4f 100644
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -826,7 +826,7 @@ class ServiceForm(NetBoxModelForm):
             except ObjectDoesNotExist:
                 pass
 
-            if self.instance and parent_object_type_id != self.instance.parent_object_type_id:
+            if self.instance and self.instance.pk and parent_object_type_id != self.instance.parent_object_type_id:
                 self.initial['parent'] = None
 
     def clean(self):
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 5bd731535..10352d45a 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -308,7 +308,7 @@
                 {% trans "Services" %}
                 {% if perms.ipam.add_service %}
                   <div class="card-actions">
-                    <a href="{% url 'ipam:service_add' %}?device={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
+                    <a href="{% url 'ipam:service_add' %}?parent_object_type={{ object|content_type_id }}&parent={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
                       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add a service" %}
                     </a>
                   </div>
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 46eab9f36..70c31a83b 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -154,7 +154,7 @@
             {% trans "Services" %}
             {% if perms.ipam.add_service %}
               <div class="card-actions">
-                <a href="{% url 'ipam:service_add' %}?virtual_machine={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
+                <a href="{% url 'ipam:service_add' %}?parent_object_type={{ object|content_type_id }}&parent={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
                   <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add a service" %}
                 </a>
               </div>