From 5b7f350ded6f8efed438d78b603d7f7341431f5d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 28 Sep 2016 17:20:16 -0400 Subject: [PATCH] Added headers to all bulk edit tables --- netbox/secrets/forms.py | 2 +- netbox/templates/circuits/circuit_bulk_edit.html | 13 ++++++++++--- netbox/templates/circuits/provider_bulk_edit.html | 7 ++++++- netbox/templates/dcim/device_bulk_edit.html | 9 ++++++++- netbox/templates/dcim/devicetype_bulk_edit.html | 10 +++++++--- netbox/templates/dcim/interface_add_multi.html | 7 ++++++- netbox/templates/dcim/rack_bulk_edit.html | 4 +++- netbox/templates/dcim/site_bulk_edit.html | 6 +++++- netbox/templates/ipam/aggregate_bulk_edit.html | 8 +++++++- netbox/templates/ipam/ipaddress_bulk_edit.html | 12 +++++++++--- netbox/templates/ipam/prefix_bulk_edit.html | 15 +++++++++++---- netbox/templates/ipam/vlan_bulk_edit.html | 15 +++++++++++---- netbox/templates/ipam/vrf_bulk_edit.html | 8 +++++++- netbox/templates/secrets/secret_bulk_edit.html | 10 +++++++--- netbox/templates/tenancy/tenant_bulk_edit.html | 6 +++++- netbox/templates/utilities/bulk_edit_form.html | 2 +- 16 files changed, 104 insertions(+), 30 deletions(-) diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py index d8368cc32..cd2a77ae3 100644 --- a/netbox/secrets/forms.py +++ b/netbox/secrets/forms.py @@ -91,7 +91,7 @@ class SecretImportForm(BulkImportForm, BootstrapMixin): class SecretBulkEditForm(forms.Form, BootstrapMixin): pk = forms.ModelMultipleChoiceField(queryset=Secret.objects.all(), widget=forms.MultipleHiddenInput) - role = forms.ModelChoiceField(queryset=SecretRole.objects.all()) + role = forms.ModelChoiceField(queryset=SecretRole.objects.all(), required=False) name = forms.CharField(max_length=100, required=False) diff --git a/netbox/templates/circuits/circuit_bulk_edit.html b/netbox/templates/circuits/circuit_bulk_edit.html index 4c474af3e..2b03cda2e 100644 --- a/netbox/templates/circuits/circuit_bulk_edit.html +++ b/netbox/templates/circuits/circuit_bulk_edit.html @@ -3,14 +3,21 @@ {% block title %}Circuit Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Circuit + Type + Provider + Port speed + Commit rate + {% for circuit in selected_objects %} {{ circuit }} {{ circuit.type }} {{ circuit.provider }} - {{ circuit.port_speed }} Kbps - {{ circuit.commit_rate }} + {{ circuit.port_speed_human }} + {{ circuit.commit_rate_human }} {% endfor %} {% endblock %} diff --git a/netbox/templates/circuits/provider_bulk_edit.html b/netbox/templates/circuits/provider_bulk_edit.html index af92861b0..2e6321a09 100644 --- a/netbox/templates/circuits/provider_bulk_edit.html +++ b/netbox/templates/circuits/provider_bulk_edit.html @@ -3,7 +3,12 @@ {% block title %}Provider Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Provider + Account + ASN + {% for provider in selected_objects %} {{ provider }} diff --git a/netbox/templates/dcim/device_bulk_edit.html b/netbox/templates/dcim/device_bulk_edit.html index 8a9e08136..21d72e238 100644 --- a/netbox/templates/dcim/device_bulk_edit.html +++ b/netbox/templates/dcim/device_bulk_edit.html @@ -3,7 +3,14 @@ {% block title %}Device Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Device + Type + Role + Tenant + Serial + {% for device in selected_objects %} {{ device }} diff --git a/netbox/templates/dcim/devicetype_bulk_edit.html b/netbox/templates/dcim/devicetype_bulk_edit.html index 22911e9f0..ebeb0b781 100644 --- a/netbox/templates/dcim/devicetype_bulk_edit.html +++ b/netbox/templates/dcim/devicetype_bulk_edit.html @@ -3,11 +3,15 @@ {% block title %}Device Type Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Device type + Manufacturer + Height + {% for devicetype in selected_objects %} - {{ devicetype }} - {{ devicetype.model }} + {{ devicetype.model }} {{ devicetype.manufacturer }} {{ devicetype.u_height }}U diff --git a/netbox/templates/dcim/interface_add_multi.html b/netbox/templates/dcim/interface_add_multi.html index 40e220009..3d56dc165 100644 --- a/netbox/templates/dcim/interface_add_multi.html +++ b/netbox/templates/dcim/interface_add_multi.html @@ -7,7 +7,12 @@ {% block form_title %}Interface(s) to Add{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Device + Type + Role + {% for device in selected_objects %} {{ device }} diff --git a/netbox/templates/dcim/rack_bulk_edit.html b/netbox/templates/dcim/rack_bulk_edit.html index 5ffa00582..d1a8dac0e 100644 --- a/netbox/templates/dcim/rack_bulk_edit.html +++ b/netbox/templates/dcim/rack_bulk_edit.html @@ -3,12 +3,13 @@ {% block title %}Rack Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} Name Site Group Tenant + Role Type Width Height @@ -19,6 +20,7 @@ {{ rack.site }} {{ rack.group }} {{ rack.tenant }} + {{ rack.role }} {{ rack.get_type_display }} {{ rack.get_width_display }} {{ rack.u_height }}U diff --git a/netbox/templates/dcim/site_bulk_edit.html b/netbox/templates/dcim/site_bulk_edit.html index f8b6ddc9c..34523bd82 100644 --- a/netbox/templates/dcim/site_bulk_edit.html +++ b/netbox/templates/dcim/site_bulk_edit.html @@ -3,7 +3,11 @@ {% block title %}Site Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Site + Tenant + {% for site in selected_objects %} {{ site }} diff --git a/netbox/templates/ipam/aggregate_bulk_edit.html b/netbox/templates/ipam/aggregate_bulk_edit.html index c61a94aca..b5c09e48f 100644 --- a/netbox/templates/ipam/aggregate_bulk_edit.html +++ b/netbox/templates/ipam/aggregate_bulk_edit.html @@ -3,7 +3,13 @@ {% block title %}Aggregate Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Aggregate + RIR + Date Added + Description + {% for aggregate in selected_objects %} {{ aggregate }} diff --git a/netbox/templates/ipam/ipaddress_bulk_edit.html b/netbox/templates/ipam/ipaddress_bulk_edit.html index bb809920b..818fc20e6 100644 --- a/netbox/templates/ipam/ipaddress_bulk_edit.html +++ b/netbox/templates/ipam/ipaddress_bulk_edit.html @@ -3,14 +3,20 @@ {% block title %}IP Address Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + IP Address + VRF + Tenant + Assigned + Description + {% for ipaddress in selected_objects %} {{ ipaddress }} {{ ipaddress.vrf|default:"Global" }} {{ ipaddress.tenant }} - {{ ipaddress.interface.device }} - {{ ipaddress.interface }} + {% if ipaddress.interface %}{% endif %} {{ ipaddress.description }} {% endfor %} diff --git a/netbox/templates/ipam/prefix_bulk_edit.html b/netbox/templates/ipam/prefix_bulk_edit.html index 6c17d5b71..b1b915b0e 100644 --- a/netbox/templates/ipam/prefix_bulk_edit.html +++ b/netbox/templates/ipam/prefix_bulk_edit.html @@ -3,16 +3,23 @@ {% block title %}Prefix Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Prefix + Site + VRF + Tenant + Status + Role + {% for prefix in selected_objects %} {{ prefix }} + {{ prefix.site }} {{ prefix.vrf|default:"Global" }} {{ prefix.tenant }} - {{ prefix.site }} - {{ prefix.status }} + {{ prefix.get_status_display }} {{ prefix.role }} - {{ prefix.description }} {% endfor %} {% endblock %} diff --git a/netbox/templates/ipam/vlan_bulk_edit.html b/netbox/templates/ipam/vlan_bulk_edit.html index 38b01fe24..4829bc3cc 100644 --- a/netbox/templates/ipam/vlan_bulk_edit.html +++ b/netbox/templates/ipam/vlan_bulk_edit.html @@ -3,16 +3,23 @@ {% block title %}VLAN Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + VLAN + Site + Group + Tenant + Status + Role + {% for vlan in selected_objects %} - {{ vlan.vid }} - {{ vlan.name }} + {{ vlan }} {{ vlan.site }} + {{ vlan.group }} {{ vlan.tenant }} {{ vlan.get_status_display }} {{ vlan.role }} - {{ vlan.description }} {% endfor %} {% endblock %} diff --git a/netbox/templates/ipam/vrf_bulk_edit.html b/netbox/templates/ipam/vrf_bulk_edit.html index 344fe0905..7d57ca39d 100644 --- a/netbox/templates/ipam/vrf_bulk_edit.html +++ b/netbox/templates/ipam/vrf_bulk_edit.html @@ -3,7 +3,13 @@ {% block title %}VRF Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + VRF + RD + Tenant + Description + {% for vrf in selected_objects %} {{ vrf.name }} diff --git a/netbox/templates/secrets/secret_bulk_edit.html b/netbox/templates/secrets/secret_bulk_edit.html index 60ae9b22b..6c64b09dd 100644 --- a/netbox/templates/secrets/secret_bulk_edit.html +++ b/netbox/templates/secrets/secret_bulk_edit.html @@ -3,11 +3,15 @@ {% block title %}Secret Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Device + Role + Name + {% for secret in selected_objects %} - {{ secret }} - {{ secret.device }} + {{ secret.device }} {{ secret.role }} {{ secret.name }} diff --git a/netbox/templates/tenancy/tenant_bulk_edit.html b/netbox/templates/tenancy/tenant_bulk_edit.html index f9bd55cf2..25b08ad10 100644 --- a/netbox/templates/tenancy/tenant_bulk_edit.html +++ b/netbox/templates/tenancy/tenant_bulk_edit.html @@ -3,7 +3,11 @@ {% block title %}Tenant Bulk Edit{% endblock %} -{% block select_objects_table %} +{% block selected_objects_table %} + + Tenant + Group + {% for tenant in selected_objects %} {{ tenant }} diff --git a/netbox/templates/utilities/bulk_edit_form.html b/netbox/templates/utilities/bulk_edit_form.html index 1aa7344ce..98c07519f 100644 --- a/netbox/templates/utilities/bulk_edit_form.html +++ b/netbox/templates/utilities/bulk_edit_form.html @@ -13,7 +13,7 @@
{% block selected_objects_title %}{{ selected_objects|length }} Selected For Editing{% endblock %}
- {% block select_objects_table %}{% endblock %} + {% block selected_objects_table %}{% endblock %}