Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v3.3.1 #10154

Merged
merged 74 commits into from
Aug 25, 2022
Merged
Changes from 6 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
587a344
Documentation: distinguish release and git upgrade processes
candlerb Jul 15, 2022
3b4dd05
PRVB
jeremystretch Aug 17, 2022
5327857
Merge pull request #9744 from candlerb/candlerb/9743
jeremystretch Aug 17, 2022
c7d6fe2
Fixes #10053: Custom fields header should not be displayed when editi…
jeremystretch Aug 17, 2022
279253c
Fixes #10040: Fix exception when ordering prefixes by flat representa…
jeremystretch Aug 18, 2022
9059c09
Refresh development docs
jeremystretch Aug 18, 2022
804c064
Closes #10061: Replicate type when cloning L2VPN instances
jeremystretch Aug 18, 2022
eb3d3dc
#6454 add prerequisite alert
arthanson Aug 18, 2022
c811eb0
netbox-community#10055 - Add loop for NAT Outside
atownson Aug 18, 2022
a687aa1
netbox-community#10055 - Add loop for NAT Outside
atownson Aug 18, 2022
3f40e15
netbox-community#10055 - Add template for NAT Outside
atownson Aug 18, 2022
0bdee1d
netbox-community#10055 - Align NAT Outside with NAT Inside
atownson Aug 18, 2022
928dff6
#6454 add prerequisite alert
arthanson Aug 18, 2022
43ad8e8
netbox-community#10055: Added empty text
atownson Aug 18, 2022
38a8ddc
#6454 fix merge conflicts
arthanson Aug 18, 2022
c65a291
#6454 add L2VPN check
arthanson Aug 18, 2022
0a38c16
Fix for #10056
arthanson Aug 18, 2022
3a7ea62
fix for #10057
arthanson Aug 18, 2022
c14a597
Fixes #10089: linkify template filter should escape object representa…
jeremystretch Aug 22, 2022
2ef9e2d
Closes #10066: Use fixed column widths for custom field values in UI
jeremystretch Aug 22, 2022
9174397
fix for #10059 - add identifier to L2VPN table
arthanson Aug 22, 2022
ea1467a
fix for #10086 - change capitalization on wireless link table for Int…
arthanson Aug 22, 2022
e8f62eb
#10059 change ordering of identifier column
arthanson Aug 22, 2022
f5d81f5
Merge pull request #10093 from arthanson/art-10056
jeremystretch Aug 22, 2022
743106e
Merge pull request #10095 from arthanson/art-10057
jeremystretch Aug 22, 2022
646272f
Merge pull request #10097 from arthanson/art-10059
jeremystretch Aug 22, 2022
a972174
#6454 changes from PR review
arthanson Aug 22, 2022
25ec624
#6454 suggested review changes
arthanson Aug 22, 2022
f35ff10
Merge pull request #10096 from arthanson/art-6454
jeremystretch Aug 22, 2022
069c2d2
Changelog for #6454, #10057, #10059
jeremystretch Aug 22, 2022
71bf5f4
Updated exists evaluation
atownson Aug 22, 2022
2bb79e1
Updated exists evaluation
atownson Aug 22, 2022
6179686
Corrected IPv6 family
atownson Aug 22, 2022
0c7c61b
#10037 add Child Interface to context menu
arthanson Aug 22, 2022
9fddd19
#10094 fix Contact AddAnother
arthanson Aug 22, 2022
41499b1
#10094 fix Contact AddAnother
arthanson Aug 22, 2022
f48aaf1
#10094 fix Contact AddAnother
arthanson Aug 22, 2022
63e8fae
Changed nat_outside to ManyToManyColumn
atownson Aug 23, 2022
7b41892
Merge pull request #10065 from atownson/issue_10055
jeremystretch Aug 23, 2022
984d8b8
Fixes #10108: Linkify inside NAT IPs for primary device IPs in UI
jeremystretch Aug 23, 2022
f3906dd
Fixes #10111 - Wrap search QS to catch ValueError on identifier field
DanSheps Aug 23, 2022
7ba0b42
Fixes #10109: Fix available prefixes calculation for container prefix…
jeremystretch Aug 23, 2022
bf92e3a
Merge pull request #10114 from netbox-community/10109-available-prefixes
jeremystretch Aug 23, 2022
c11ca54
#10037 default type to virtual
arthanson Aug 23, 2022
8b1a462
#10094 changes from code review
arthanson Aug 23, 2022
374abe5
#10033 disable Add a Termination button if 2 terminations on L2VPN P2P
arthanson Aug 23, 2022
219f2ee
Merge pull request #10101 from arthanson/art-10037
jeremystretch Aug 23, 2022
439cf1a
#10033 changes from code review
arthanson Aug 23, 2022
1c46102
#10094 changes from code review
arthanson Aug 23, 2022
deee366
Merge pull request #10120 from arthanson/art-10086
jeremystretch Aug 24, 2022
3110765
Merge pull request #10103 from arthanson/art-10094
jeremystretch Aug 24, 2022
6a7c56d
Merge pull request #10115 from arthanson/art-10033
jeremystretch Aug 24, 2022
18d5576
Changelog for #10033, #10037, #10094
jeremystretch Aug 24, 2022
36729fb
Fixes #10134: Custom fields data serializer should return a 400 respo…
jeremystretch Aug 24, 2022
c2c8bd0
Closes #10133: Enable nullifying device location during bulk edit
jeremystretch Aug 24, 2022
2baf06e
Add unique slugs to L2VPNs in relevant tests
jeremystretch Aug 24, 2022
bfbf97a
Closes #10031: Enforce 'application/json' content type for REST API r…
jeremystretch Aug 24, 2022
eb2bf34
#9935 add new wireless choices for interfaces (#10116)
arthanson Aug 24, 2022
f70ef7a
Changelog and cleanup for #9935
jeremystretch Aug 24, 2022
4132027
fixes for #10070 make l2vpn slug unique (#10119)
arthanson Aug 24, 2022
6c686af
Changelog for #10070
jeremystretch Aug 24, 2022
ec2e8ad
#10139 update development documents for githooks and web-ui (#10141)
arthanson Aug 25, 2022
482b4b6
Fixes #10147: Permit the creation of 0U device types via REST API
jeremystretch Aug 25, 2022
9da9a20
Fixes #10087: Correct display of far end in console/power/interface c…
jeremystretch Aug 25, 2022
5f37699
Fixes #9663: Omit available IP annotations when filtering prefix chil…
jeremystretch Aug 25, 2022
bb37ebf
#10038 add assign FHRP group to device-interface context menu (#10151)
arthanson Aug 25, 2022
7697779
#10038 add L2VPN termination to interface list context menu (#10152)
arthanson Aug 25, 2022
32615be
#10038 & #10039: Changelog & replicate for VM interfaces
jeremystretch Aug 25, 2022
1379b9c
Tweak display of prerequisite model warning
jeremystretch Aug 25, 2022
a9ddd41
Fix SSO signon for SAML with idp (#10137)
arthanson Aug 25, 2022
7bdbdda
Changelog for #10135
jeremystretch Aug 25, 2022
61ba581
Add branch naming standard to developer docs
jeremystretch Aug 25, 2022
a416ff6
Fixes #10118: Fix display of connected LLDP neighbors for devices
jeremystretch Aug 25, 2022
ed4fe6b
Release v3.3.1
jeremystretch Aug 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions netbox/netbox/views/generic/object_views.py
Original file line number Diff line number Diff line change
@@ -328,6 +328,12 @@ def alter_object(self, obj, request, url_args, url_kwargs):
"""
return obj

def get_extra_addanother_params(self, request):
"""
Return a dictionary of extra parameters to use on the Add Another button.
"""
return {}

#
# Request handlers
#
@@ -403,6 +409,7 @@ def post(self, request, *args, **kwargs):

# If cloning is supported, pre-populate a new instance of the form
params = prepare_cloned_fields(obj)
params.update(self.get_extra_addanother_params(request))
if params:
if 'return_url' in request.GET:
params['return_url'] = request.GET.get('return_url')
7 changes: 7 additions & 0 deletions netbox/tenancy/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib.contenttypes.models import ContentType
from django.http import QueryDict
from django.shortcuts import get_object_or_404

from circuits.models import Circuit
@@ -365,6 +366,12 @@ def alter_object(self, instance, request, args, kwargs):
instance.object = get_object_or_404(content_type.model_class(), pk=request.GET.get('object_id'))
return instance

def get_extra_addanother_params(self, request):
return {
'content_type': request.GET.get('content_type'),
'object_id': request.GET.get('object_id'),
}


class ContactAssignmentDeleteView(generic.ObjectDeleteView):
queryset = ContactAssignment.objects.all()
2 changes: 1 addition & 1 deletion netbox/utilities/utils.py
Original file line number Diff line number Diff line change
@@ -285,7 +285,7 @@ def prepare_cloned_fields(instance):
"""
# Generate the clone attributes from the instance
if not hasattr(instance, 'clone'):
return QueryDict()
return QueryDict(mutable=True)
attrs = instance.clone()

# Prepare querydict parameters