From 48141c06930f19e9fd2f39f378c42fd463dbd44b Mon Sep 17 00:00:00 2001 From: Zach Moody Date: Fri, 24 Mar 2017 17:38:06 -0500 Subject: [PATCH 1/3] Fixes #996 --- netbox/circuits/forms.py | 2 +- netbox/dcim/forms.py | 10 +++++----- netbox/ipam/forms.py | 2 +- netbox/project-static/js/livesearch.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 940ae939a..167ab8943 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -183,7 +183,7 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm): label='Device', widget=Livesearch( query_key='q', - query_url='dcim-api:device_list', + query_url='dcim-api:device-list', field_to_update='device' ) ) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 8f3e73e04..f6f3eeeac 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -929,7 +929,7 @@ class ConsolePortConnectionForm(BootstrapMixin, forms.ModelForm): label='Console Server', widget=Livesearch( query_key='q', - query_url='dcim-api:device_list', + query_url='dcim-api:device-list', field_to_update='console_server', ) ) @@ -1030,7 +1030,7 @@ class ConsoleServerPortConnectionForm(BootstrapMixin, forms.Form): label='Device', widget=Livesearch( query_key='q', - query_url='dcim-api:device_list', + query_url='dcim-api:device-list', field_to_update='device' ) ) @@ -1197,7 +1197,7 @@ class PowerPortConnectionForm(BootstrapMixin, forms.ModelForm): label='PDU', widget=Livesearch( query_key='q', - query_url='dcim-api:device_list', + query_url='dcim-api:device-list', field_to_update='pdu' ) ) @@ -1296,7 +1296,7 @@ class PowerOutletConnectionForm(BootstrapMixin, forms.Form): label='Device', widget=Livesearch( query_key='q', - query_url='dcim-api:device_list', + query_url='dcim-api:device-list', field_to_update='device' ) ) @@ -1459,7 +1459,7 @@ class InterfaceConnectionForm(BootstrapMixin, forms.ModelForm): label='Device', widget=Livesearch( query_key='q', - query_url='dcim-api:device_list', + query_url='dcim-api:device-list', field_to_update='device_b' ) ) diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 72b73208c..ca89f0cc6 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -404,7 +404,7 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form): label='Device', widget=Livesearch( query_key='q', - query_url='dcim-api:device_list', + query_url='dcim-api:device-list', field_to_update='device' ) ) diff --git a/netbox/project-static/js/livesearch.js b/netbox/project-static/js/livesearch.js index 919fccf3b..f387372b4 100644 --- a/netbox/project-static/js/livesearch.js +++ b/netbox/project-static/js/livesearch.js @@ -27,7 +27,7 @@ $(document).ready(function() { data: search_key + '=' + request.term, success: function(data) { var choices = []; - $.each(data, function (index, choice) { + $.each(data.results, function (index, choice) { choices.push({ value: choice.id, label: choice[label] From 066a3b8b5234d907c6b638b689ed1b8902726201 Mon Sep 17 00:00:00 2001 From: Zach Moody Date: Fri, 24 Mar 2017 18:42:23 -0500 Subject: [PATCH 2/3] update `api_url` with new interfaces endpoint. --- netbox/circuits/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 167ab8943..384fc053d 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -192,7 +192,7 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm): required=False, label='Interface', 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' ) ) From 22bfac746ef17b22ea757fc104f634ce76cc4e29 Mon Sep 17 00:00:00 2001 From: Zach Moody Date: Fri, 24 Mar 2017 18:58:19 -0500 Subject: [PATCH 3/3] fix remaining legacy api url paths. --- netbox/dcim/forms.py | 10 +++++----- netbox/ipam/forms.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index f6f3eeeac..6473e5e56 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -937,7 +937,7 @@ class ConsolePortConnectionForm(BootstrapMixin, forms.ModelForm): queryset=ConsoleServerPort.objects.all(), label='Port', 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', ) ) @@ -1038,7 +1038,7 @@ class ConsoleServerPortConnectionForm(BootstrapMixin, forms.Form): queryset=ConsolePort.objects.all(), label='Port', widget=APISelect( - api_url='/api/dcim/devices/{{device}}/console-ports/', + api_url='/api/dcim/console-ports/?device_id={{device}}', disabled_indicator='cs_port' ) ) @@ -1205,7 +1205,7 @@ class PowerPortConnectionForm(BootstrapMixin, forms.ModelForm): queryset=PowerOutlet.objects.all(), label='Outlet', widget=APISelect( - api_url='/api/dcim/devices/{{pdu}}/power-outlets/', + api_url='/api/dcim/power-outlets/?device_id={{device}}', disabled_indicator='connected_port' ) ) @@ -1304,7 +1304,7 @@ class PowerOutletConnectionForm(BootstrapMixin, forms.Form): queryset=PowerPort.objects.all(), label='Port', widget=APISelect( - api_url='/api/dcim/devices/{{device}}/power-ports/', + api_url='/api/dcim/power-ports/?device_id={{device}}', disabled_indicator='power_outlet' ) ) @@ -1467,7 +1467,7 @@ class InterfaceConnectionForm(BootstrapMixin, forms.ModelForm): queryset=Interface.objects.all(), label='Interface', 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' ) ) diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index ca89f0cc6..b55fb492f 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -412,7 +412,7 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form): queryset=Interface.objects.all(), label='Interface', widget=APISelect( - api_url='/api/dcim/devices/{{device}}/interfaces/' + api_url='/api/dcim/interfaces/?device_id={{device}}' ) ) set_as_primary = forms.BooleanField(