From 7583912de7a9cca48cdc5f51a554d8272015594f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Oct 2018 15:30:28 -0400 Subject: [PATCH 1/4] 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 c1440b85a..2c855fe31 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ if sys.version_info[0] < 3: DeprecationWarning ) -VERSION = '2.4.5' +VERSION = '2.4.6-dev' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From 99848aab6ac2dfb2834ac66afb0438d7ebb06e91 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 3 Oct 2018 16:17:17 -0400 Subject: [PATCH 2/4] Fixes #2483: Set max item count of API-populated form fields to MAX_PAGE_SIZE --- CHANGELOG.md | 8 ++++++++ netbox/project-static/js/forms.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36cb0d4f3..36304742d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +v2.4.6 (FUTURE) + +## Bug Fixes + +[#2483](https://github.com/digitalocean/netbox/issues/2483) - Set max item count of API-populated form fields to MAX_PAGE_SIZE + +--- + v2.4.5 (2018-10-02) ## Enhancements diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js index 193e95ae8..967ff58c9 100644 --- a/netbox/project-static/js/forms.js +++ b/netbox/project-static/js/forms.js @@ -82,7 +82,7 @@ $(document).ready(function() { } if ($(parent).val() || $(parent).attr('nullable') == 'true') { - var api_url = child_field.attr('api-url'); + var api_url = child_field.attr('api-url') + '&limit=0'; var disabled_indicator = child_field.attr('disabled-indicator'); var initial_value = child_field.attr('initial'); var display_field = child_field.attr('display-field') || 'name'; From 1b2e9a6d066e118850cc01309f1c36b54374b9b4 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Wed, 3 Oct 2018 17:16:01 -0400 Subject: [PATCH 3/4] fixes #2484 - Local config context not available on the Virtual Machine Edit Form --- CHANGELOG.md | 3 ++- netbox/virtualization/forms.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36304742d..d15dd9bbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ v2.4.6 (FUTURE) ## Bug Fixes -[#2483](https://github.com/digitalocean/netbox/issues/2483) - Set max item count of API-populated form fields to MAX_PAGE_SIZE +* [#2483](https://github.com/digitalocean/netbox/issues/2483) - Set max item count of API-populated form fields to MAX_PAGE_SIZE +* [#2484](https://github.com/digitalocean/netbox/issues/2484) - Local config context not available on the Virtual Machine Edit Form --- diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index e94c2cdaa..8f973955c 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -253,7 +253,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm): model = VirtualMachine fields = [ 'name', 'status', 'cluster_group', 'cluster', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6', - 'vcpus', 'memory', 'disk', 'comments', 'tags', + 'vcpus', 'memory', 'disk', 'comments', 'tags', 'local_context_data', ] help_texts = { 'local_context_data': "Local config context data overwrites all sources contexts in the final rendered config context", From a68d9e40d54a79ba30a624f316ad402cdf70706f Mon Sep 17 00:00:00 2001 From: Berkay Demir Date: Thu, 4 Oct 2018 18:26:23 +0300 Subject: [PATCH 4/4] test --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b3bee6b6d..962bab847 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,4 +20,5 @@ psycopg2-binary==2.7.5 py-gfm==0.1.3 pycryptodome==3.6.4 xmltodict==0.11.0 +test=1.1