Просмотр исходного кода

Fixes #2915: Fix bulk editing of pass-through ports

Jeremy Stretch 7 лет назад
Родитель
Сommit
c8366eff8f
3 измененных файлов с 11 добавлено и 2 удалено
  1. 1 0
      CHANGELOG.md
  2. 2 2
      netbox/dcim/forms.py
  3. 8 0
      netbox/templates/utilities/obj_bulk_edit.html

+ 1 - 0
CHANGELOG.md

@@ -17,6 +17,7 @@ v2.5.7 (FUTURE)
 * [#2912](https://github.com/digitalocean/netbox/issues/2912) - Cable type in filter form should be blank by default
 * [#2912](https://github.com/digitalocean/netbox/issues/2912) - Cable type in filter form should be blank by default
 * [#2913](https://github.com/digitalocean/netbox/issues/2913) - Fix assigned prefixes link on VRF view
 * [#2913](https://github.com/digitalocean/netbox/issues/2913) - Fix assigned prefixes link on VRF view
 * [#2914](https://github.com/digitalocean/netbox/issues/2914) - Fix empty connected circuit link on device interfaces list
 * [#2914](https://github.com/digitalocean/netbox/issues/2914) - Fix empty connected circuit link on device interfaces list
+* [#2915](https://github.com/digitalocean/netbox/issues/2915) - Fix bulk editing of pass-through ports
 
 
 v2.5.6 (2019-02-13)
 v2.5.6 (2019-02-13)
 
 

+ 2 - 2
netbox/dcim/forms.py

@@ -2362,7 +2362,7 @@ class FrontPortCreateForm(ComponentForm):
 
 
 class FrontPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
 class FrontPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
     pk = forms.ModelMultipleChoiceField(
-        queryset=Interface.objects.all(),
+        queryset=FrontPort.objects.all(),
         widget=forms.MultipleHiddenInput()
         widget=forms.MultipleHiddenInput()
     )
     )
     type = forms.ChoiceField(
     type = forms.ChoiceField(
@@ -2436,7 +2436,7 @@ class RearPortCreateForm(ComponentForm):
 
 
 class RearPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
 class RearPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
     pk = forms.ModelMultipleChoiceField(
-        queryset=Interface.objects.all(),
+        queryset=RearPort.objects.all(),
         widget=forms.MultipleHiddenInput()
         widget=forms.MultipleHiddenInput()
     )
     )
     type = forms.ChoiceField(
     type = forms.ChoiceField(

+ 8 - 0
netbox/templates/utilities/obj_bulk_edit.html

@@ -4,6 +4,14 @@
 
 
 {% block content %}
 {% block content %}
 <h1>{% block title %}Editing {{ table.rows|length }} {{ obj_type_plural|bettertitle }}{% endblock %}</h1>
 <h1>{% block title %}Editing {{ table.rows|length }} {{ obj_type_plural|bettertitle }}{% endblock %}</h1>
+{% if form.errors %}
+    <div class="panel panel-danger">
+        <div class="panel-heading"><strong>Errors</strong></div>
+        <div class="panel-body">
+            {{ form.errors }}
+        </div>
+    </div>
+{% endif %}
 <form action="" method="post" class="form form-horizontal">
 <form action="" method="post" class="form form-horizontal">
     {% csrf_token %}
     {% csrf_token %}
     {% if request.POST.return_url %}
     {% if request.POST.return_url %}