NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 12:12:53 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #997 from digitalocean/livesearch-fix

Browse Source 
Fixes #996
This commit is contained in:
Jeremy Stretch 2017-03-27 09:38:48 -04:00 committed by GitHub
commit cf3e7f90d6
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/circuits/forms.py
View File

@ -183,7 +183,7 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm):
label='Device', label='Device',
widget=Livesearch( widget=Livesearch(
query_key='q', query_key='q',
query_url='dcim-api:device_list', query_url='dcim-api:device-list',
field_to_update='device' field_to_update='device'
) )
) )
@ -192,7 +192,7 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm):
required=False, required=False,
label='Interface', label='Interface',
widget=APISelect( widget=APISelect(
api_url='/api/dcim/devices/{{device}}/interfaces/?type=physical', api_url='/api/dcim/interfaces/?device_id={{device}}&type=physical',
disabled_indicator='is_connected' disabled_indicator='is_connected'
) )
) )

20
netbox/dcim/forms.py
View File

@ -929,7 +929,7 @@ class ConsolePortConnectionForm(BootstrapMixin, forms.ModelForm):
label='Console Server', label='Console Server',
widget=Livesearch( widget=Livesearch(
query_key='q', query_key='q',
query_url='dcim-api:device_list', query_url='dcim-api:device-list',
field_to_update='console_server', field_to_update='console_server',
) )
) )
@ -937,7 +937,7 @@ class ConsolePortConnectionForm(BootstrapMixin, forms.ModelForm):
queryset=ConsoleServerPort.objects.all(), queryset=ConsoleServerPort.objects.all(),
label='Port', label='Port',
widget=APISelect( widget=APISelect(
api_url='/api/dcim/devices/{{console_server}}/console-server-ports/', api_url='/api/dcim/console-server-ports/?device_id={{device}}',
disabled_indicator='connected_console', disabled_indicator='connected_console',
) )
) )
@ -1030,7 +1030,7 @@ class ConsoleServerPortConnectionForm(BootstrapMixin, forms.Form):
label='Device', label='Device',
widget=Livesearch( widget=Livesearch(
query_key='q', query_key='q',
query_url='dcim-api:device_list', query_url='dcim-api:device-list',
field_to_update='device' field_to_update='device'
) )
) )
@ -1038,7 +1038,7 @@ class ConsoleServerPortConnectionForm(BootstrapMixin, forms.Form):
queryset=ConsolePort.objects.all(), queryset=ConsolePort.objects.all(),
label='Port', label='Port',
widget=APISelect( widget=APISelect(
api_url='/api/dcim/devices/{{device}}/console-ports/', api_url='/api/dcim/console-ports/?device_id={{device}}',
disabled_indicator='cs_port' disabled_indicator='cs_port'
) )
) )
@ -1197,7 +1197,7 @@ class PowerPortConnectionForm(BootstrapMixin, forms.ModelForm):
label='PDU', label='PDU',
widget=Livesearch( widget=Livesearch(
query_key='q', query_key='q',
query_url='dcim-api:device_list', query_url='dcim-api:device-list',
field_to_update='pdu' field_to_update='pdu'
) )
) )
@ -1205,7 +1205,7 @@ class PowerPortConnectionForm(BootstrapMixin, forms.ModelForm):
queryset=PowerOutlet.objects.all(), queryset=PowerOutlet.objects.all(),
label='Outlet', label='Outlet',
widget=APISelect( widget=APISelect(
api_url='/api/dcim/devices/{{pdu}}/power-outlets/', api_url='/api/dcim/power-outlets/?device_id={{device}}',
disabled_indicator='connected_port' disabled_indicator='connected_port'
) )
) )
@ -1296,7 +1296,7 @@ class PowerOutletConnectionForm(BootstrapMixin, forms.Form):
label='Device', label='Device',
widget=Livesearch( widget=Livesearch(
query_key='q', query_key='q',
query_url='dcim-api:device_list', query_url='dcim-api:device-list',
field_to_update='device' field_to_update='device'
) )
) )
@ -1304,7 +1304,7 @@ class PowerOutletConnectionForm(BootstrapMixin, forms.Form):
queryset=PowerPort.objects.all(), queryset=PowerPort.objects.all(),
label='Port', label='Port',
widget=APISelect( widget=APISelect(
api_url='/api/dcim/devices/{{device}}/power-ports/', api_url='/api/dcim/power-ports/?device_id={{device}}',
disabled_indicator='power_outlet' disabled_indicator='power_outlet'
) )
) )
@ -1459,7 +1459,7 @@ class InterfaceConnectionForm(BootstrapMixin, forms.ModelForm):
label='Device', label='Device',
widget=Livesearch( widget=Livesearch(
query_key='q', query_key='q',
query_url='dcim-api:device_list', query_url='dcim-api:device-list',
field_to_update='device_b' field_to_update='device_b'
) )
) )
@ -1467,7 +1467,7 @@ class InterfaceConnectionForm(BootstrapMixin, forms.ModelForm):
queryset=Interface.objects.all(), queryset=Interface.objects.all(),
label='Interface', label='Interface',
widget=APISelect( widget=APISelect(
api_url='/api/dcim/devices/{{device_b}}/interfaces/?type=physical', api_url='/api/dcim/interfaces/?device_id={{device_b}}&type=physical',
disabled_indicator='is_connected' disabled_indicator='is_connected'
) )
) )

4
netbox/ipam/forms.py
View File

@ -404,7 +404,7 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form):
label='Device', label='Device',
widget=Livesearch( widget=Livesearch(
query_key='q', query_key='q',
query_url='dcim-api:device_list', query_url='dcim-api:device-list',
field_to_update='device' field_to_update='device'
) )
) )
@ -412,7 +412,7 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form):
queryset=Interface.objects.all(), queryset=Interface.objects.all(),
label='Interface', label='Interface',
widget=APISelect( widget=APISelect(
api_url='/api/dcim/devices/{{device}}/interfaces/' api_url='/api/dcim/interfaces/?device_id={{device}}'
) )
) )
set_as_primary = forms.BooleanField( set_as_primary = forms.BooleanField(

2
netbox/project-static/js/livesearch.js
View File

@ -27,7 +27,7 @@ $(document).ready(function() {
data: search_key + '=' + request.term, data: search_key + '=' + request.term,
success: function(data) { success: function(data) {
var choices = []; var choices = [];
$.each(data, function (index, choice) { $.each(data.results, function (index, choice) {
choices.push({ choices.push({
value: choice.id, value: choice.id,
label: choice[label] label: choice[label]