From ebb6729a268b5574b026cfcd35bb15df46388257 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 May 2017 15:13:40 -0400 Subject: [PATCH 1/7] Post-release version bump --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index a35fea83e..093dc36b4 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -13,7 +13,7 @@ except ImportError: ) -VERSION = '2.0.0' +VERSION = '2.0.1-dev' # Import local configuration ALLOWED_HOSTS = DATABASE = SECRET_KEY = None From 44d78ef92ace2f5c1ce043200ece21c8d085f0a4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 May 2017 17:01:43 -0400 Subject: [PATCH 2/7] Fixes #1149: Port list does not populate when creating a console or power connection --- netbox/dcim/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 881ad28c7..79fb865df 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -976,7 +976,7 @@ class ConsolePortConnectionForm(BootstrapMixin, forms.ModelForm): queryset=ConsoleServerPort.objects.all(), label='Port', widget=APISelect( - api_url='/api/dcim/console-server-ports/?device_id={{device}}', + api_url='/api/dcim/console-server-ports/?device_id={{console_server}}', disabled_indicator='connected_console', ) ) @@ -1244,7 +1244,7 @@ class PowerPortConnectionForm(BootstrapMixin, forms.ModelForm): queryset=PowerOutlet.objects.all(), label='Outlet', widget=APISelect( - api_url='/api/dcim/power-outlets/?device_id={{device}}', + api_url='/api/dcim/power-outlets/?device_id={{pdu}}', disabled_indicator='connected_port' ) ) From 0fb12bcc9c2c165270924fceb99269ebb4be1e98 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 May 2017 17:06:17 -0400 Subject: [PATCH 3/7] Fixes #1151: name 'escape' is not defined --- netbox/dcim/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 9b0d41065..15755cbe9 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -11,6 +11,7 @@ from django.db.models import Count from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse +from django.utils.html import escape from django.utils.http import urlencode from django.utils.safestring import mark_safe from django.views.generic import View From 8e333757f9a1255a02aa581a099586d9f7c29716 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 May 2017 17:12:45 -0400 Subject: [PATCH 4/7] Fixes #1150: Error when uploading image attachments with Unicode names under Python 2 --- netbox/extras/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 06ed07b85..62eb07d1a 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -383,7 +383,7 @@ def image_upload(instance, filename): elif instance.name: filename = instance.name - return '{}{}_{}_{}'.format(path, instance.content_type.name, instance.object_id, filename) + return u'{}{}_{}_{}'.format(path, instance.content_type.name, instance.object_id, filename) @python_2_unicode_compatible From 3844f70a4d4ea3bea0fbeb97150c948828d5d6e5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 May 2017 17:53:37 -0400 Subject: [PATCH 5/7] Fixes #1152: Unable to edit user keys --- netbox/project-static/js/secrets.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/netbox/project-static/js/secrets.js b/netbox/project-static/js/secrets.js index da5e52b74..89326ff15 100644 --- a/netbox/project-static/js/secrets.js +++ b/netbox/project-static/js/secrets.js @@ -16,13 +16,14 @@ $(document).ready(function() { // Adding/editing a secret $('form').submit(function(event) { - if ( - $(this).find('input.requires-session-key').filter(function() {return this.value == ""}) && - document.cookie.indexOf('session_key') == -1 - ) { - $('#privkey_modal').modal('show'); - event.preventDefault(); - } + $(this).find('input.requires-session-key').each(function() { + if (this.value && document.cookie.indexOf('session_key') == -1) { + console.log('Field ' + this.value + ' requires a session key'); + $('#privkey_modal').modal('show'); + event.preventDefault(); + return false; + } + }); }); // Retrieve a session key From effda88b51e5b3c059540d898565072ffc4e6641 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 May 2017 22:40:46 -0400 Subject: [PATCH 6/7] Fixes #1153: UnicodeEncodeError when searching for non-ASCII characters on Python 2 --- netbox/netbox/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 6aec89701..8e42086bc 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -191,7 +191,7 @@ class SearchView(View): results.append({ 'name': queryset.model._meta.verbose_name_plural, 'table': table, - 'url': '{}?q={}'.format(reverse(url), form.cleaned_data['q']) + 'url': u'{}?q={}'.format(reverse(url), form.cleaned_data['q']) }) return render(request, 'search.html', { From b89bd24bed356f9c7c01a58ce0790e425e819439 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 May 2017 22:41:37 -0400 Subject: [PATCH 7/7] Release v2.0.1 --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 093dc36b4..861c618cd 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -13,7 +13,7 @@ except ImportError: ) -VERSION = '2.0.1-dev' +VERSION = '2.0.1' # Import local configuration ALLOWED_HOSTS = DATABASE = SECRET_KEY = None