Merge a68d9e40d5 into 125975832b

CHANGELOG.md

@@ -1,3 +1,12 @@
+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
+* [#2484](https://github.com/digitalocean/netbox/issues/2484) - Local config context not available on the Virtual Machine Edit Form
+
+---
+
 v2.4.5 (2018-10-02)
 
 ## Enhancements

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__)))
 

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';

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",

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