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 #1229: Fix validation error on forms where API search is used

Browse Source
This commit is contained in:
Jeremy Stretch
2017-05-25 14:33:50 -04:00
parent ebddc46bc0
commit 1dd5e2c926
12 changed files with 173 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
netbox/templates/circuits/circuittermination_edit.html
View File

@@ -45,23 +45,8 @@
</div>
</div>
{% render_field form.site %}
<div class="row">
<div class="col-md-9 col-md-offset-3">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">Select</a></li>
<li role="presentation"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
</ul>
</div>
</div>
<div class="tab-content">
<div class="tab-pane active" id="select">
{% render_field form.rack %}
{% render_field form.device %}
</div>
<div class="tab-pane" id="search">
{% render_field form.livesearch %}
</div>
</div>
{% render_field form.rack %}
{% render_field form.device %}
{% render_field form.interface %}
</div>
</div>

7
netbox/templates/dcim/consoleport_connect.html
View File

@@ -32,12 +32,7 @@
{% render_field form.livesearch %}
</div>
<div class="tab-pane" id="select">
<div class="form-group">
<label class="col-md-3 control-label">Site</label>
<div class="col-md-9">
<p class="form-control-static">{{ consoleport.device.site }}</p>
</div>
</div>
{% render_field form.site %}
{% render_field form.rack %}
{% render_field form.console_server %}
</div>

7
netbox/templates/dcim/consoleserverport_connect.html
View File

@@ -32,12 +32,7 @@
{% render_field form.livesearch %}
</div>
<div class="tab-pane" id="select">
<div class="form-group">
<label class="col-md-3 control-label">Site</label>
<div class="col-md-9">
<p class="form-control-static">{{ consoleserverport.device.site }}</p>
</div>
</div>
{% render_field form.site %}
{% render_field form.rack %}
{% render_field form.device %}
</div>

7
netbox/templates/dcim/poweroutlet_connect.html
View File

@@ -32,12 +32,7 @@
{% render_field form.livesearch %}
</div>
<div class="tab-pane" id="select">
<div class="form-group">
<label class="col-md-3 control-label">Site</label>
<div class="col-md-9">
<p class="form-control-static">{{ poweroutlet.device.site }}</p>
</div>
</div>
{% render_field form.site %}
{% render_field form.rack %}
{% render_field form.device %}
</div>

7
netbox/templates/dcim/powerport_connect.html
View File

@@ -32,12 +32,7 @@
{% render_field form.livesearch %}
</div>
<div class="tab-pane" id="select">
<div class="form-group">
<label class="col-md-3 control-label">Site</label>
<div class="col-md-9">
<p class="form-control-static">{{ powerport.device.site }}</p>
</div>
</div>
{% render_field form.site %}
{% render_field form.rack %}
{% render_field form.pdu %}
</div>

1
netbox/templates/ipam/ipaddress_edit.html
View File

@@ -47,6 +47,7 @@
<div class="tab-content">
<div class="tab-pane active" id="select">
{% render_field form.nat_site %}
{% render_field form.nat_rack %}
{% render_field form.nat_device %}
</div>
<div class="tab-pane" id="search">