NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 09:08:15 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge a68d9e40d5 into 125975832b

Browse Source
This commit is contained in:
Berkay Demir 2018-10-04 15:27:56 +00:00 committed by GitHub
commit 06f4245b09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -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) v2.4.5 (2018-10-02)
## Enhancements ## Enhancements

2
netbox/netbox/settings.py
View File

@ -22,7 +22,7 @@ if sys.version_info[0] < 3:
DeprecationWarning DeprecationWarning
) )
VERSION = '2.4.5' VERSION = '2.4.6-dev'
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

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

@ -82,7 +82,7 @@ $(document).ready(function() {
} }
if ($(parent).val() || $(parent).attr('nullable') == 'true') { 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 disabled_indicator = child_field.attr('disabled-indicator');
var initial_value = child_field.attr('initial'); var initial_value = child_field.attr('initial');
var display_field = child_field.attr('display-field') || 'name'; var display_field = child_field.attr('display-field') || 'name';

2
netbox/virtualization/forms.py
View File

@ -253,7 +253,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
model = VirtualMachine model = VirtualMachine
fields = [ fields = [
'name', 'status', 'cluster_group', 'cluster', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6', '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 = { help_texts = {
'local_context_data': "Local config context data overwrites all sources contexts in the final rendered config context", 'local_context_data': "Local config context data overwrites all sources contexts in the final rendered config context",

1
requirements.txt
View File

@ -20,4 +20,5 @@ psycopg2-binary==2.7.5
py-gfm==0.1.3 py-gfm==0.1.3
pycryptodome==3.6.4 pycryptodome==3.6.4
xmltodict==0.11.0 xmltodict==0.11.0
test=1.1