mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #15982: Restore the "assign IP" tab

Browse Source
This commit is contained in:
Jeremy Stretch
2024-05-07 10:27:20 -04:00
parent acc2add845
commit 9316f48a20
4 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/ipam/views.py
View File

@ -781,6 +781,7 @@ class IPAddressView(generic.ObjectView):
class IPAddressEditView(generic.ObjectEditView): class IPAddressEditView(generic.ObjectEditView):
queryset = IPAddress.objects.all() queryset = IPAddress.objects.all()
form = forms.IPAddressForm form = forms.IPAddressForm
template_name = 'ipam/ipaddress_edit.html'
def alter_object(self, obj, request, url_args, url_kwargs): def alter_object(self, obj, request, url_args, url_kwargs):

19
netbox/templates/ipam/inc/ipaddress_edit_header.html
View File

@ -3,28 +3,19 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="nav-item"> <li class="nav-item">
<a <a href="{% url 'ipam:ipaddress_add' %}{% querystring request %}" class="nav-link {% if active_tab == 'add' %}active{% endif %}">
class="nav-link {% if active_tab == 'add' %}active{% endif %}" {% if object.pk %}{% trans "Edit" %}{% else %}{% trans "Create" %}{% endif %}
href="{% url 'ipam:ipaddress_add' %}{% querystring request %}"
>
{% if obj.pk %}{% trans "Edit" %}{% else %}{% trans "Create" %}{% endif %}
</a> </a>
</li> </li>
{% if 'interface' in request.GET or 'vminterface' in request.GET %} {% if 'interface' in request.GET or 'vminterface' in request.GET %}
<li class="nav-item"> <li class="nav-item">
<a <a href="{% url 'ipam:ipaddress_assign' %}{% querystring request %}" class="nav-link {% if active_tab == 'assign' %}active{% endif %}">
class="nav-link {% if active_tab == 'assign' %}active{% endif %}"
href="{% url 'ipam:ipaddress_assign' %}{% querystring request %}"
>
{% trans "Assign IP" %} {% trans "Assign IP" %}
</a> </a>
</li> </li>
{% else %} {% elif not object.pk %}
<li class="nav-item"> <li class="nav-item">
<a <a href="{% url 'ipam:ipaddress_bulk_add' %}{% querystring request %}" class="nav-link {% if active_tab == 'bulk_add' %}active{% endif %}">
class="nav-link {% if active_tab == 'bulk_add' %}active{% endif %}"
href="{% url 'ipam:ipaddress_bulk_add' %}{% querystring request %}"
>
{% trans "Bulk Create" %} {% trans "Bulk Create" %}
</a> </a>
</li> </li>

14
netbox/templates/ipam/ipaddress_assign.html
View File

@ -17,21 +17,17 @@
{% for field in form.hidden_fields %} {% for field in form.hidden_fields %}
{{ field }} {{ field }}
{% endfor %} {% endfor %}
<div class="row mb-3"> <div class="field-group my-5">
<div class="col col-md-8 offset-md-2"> <div class="row">
<div class="field-group"> <h5 class="col-9 offset-3">{% trans "Select IP Address" %}</h5>
<h6>{% trans "Select IP Address" %}</h6> </div>
{% render_field form.vrf_id %} {% render_field form.vrf_id %}
{% render_field form.q %} {% render_field form.q %}
</div> </div>
</div> <div class="text-end my-3">
</div>
<div class="row mb-3">
<div class="col col-md-8 offset-md-2 text-end">
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a> <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" class="btn btn-primary">{% trans "Search" %}</button> <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
</div> </div>
</div>
</form> </form>
{% if table %} {% if table %}
<div class="row mb-3"> <div class="row mb-3">

5
netbox/templates/ipam/ipaddress_edit.html Normal file
View File

@ -0,0 +1,5 @@
{% extends 'generic/object_edit.html' %}
{% block tabs %}
{% include 'ipam/inc/ipaddress_edit_header.html' with active_tab='add' %}
{% endblock %}