فهرست منبع

Fixes #19659: Populate initial device/VM selection for 'add a service' button

Jeremy Stretch 8 ماه پیش
والد
کامیت
7e6b1bbd79
3فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 1 1
      netbox/ipam/forms/model_forms.py
  2. 1 1
      netbox/templates/dcim/device.html
  3. 1 1
      netbox/templates/virtualization/virtualmachine.html

+ 1 - 1
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):

+ 1 - 1
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>

+ 1 - 1
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>