NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch 2023-04-27 12:11:08 -04:00
commit 6109bef700
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/release-notes/version-3.4.md
View File

@ -1,5 +1,15 @@
# NetBox v3.4 # NetBox v3.4
## v3.4.10 (2023-04-27)
### Bug Fixes
* [#11607](https://github.com/netbox-community/netbox/issues/11607) - Fix custom object field assignments made via REST API for for cables
* [#12252](https://github.com/netbox-community/netbox/issues/12252) - Fix ordering of search results when sorting by object name
* [#12355](https://github.com/netbox-community/netbox/issues/12355) - Fix escaping of certain characters in URL when rendering custom links
---
## v3.4.9 (2023-04-26) ## v3.4.9 (2023-04-26)
### Enhancements ### Enhancements

2
netbox/dcim/api/nested_serializers.py
View File

@ -456,7 +456,7 @@ class NestedInventoryItemRoleSerializer(WritableNestedSerializer):
# Cables # Cables
# #
class NestedCableSerializer(BaseModelSerializer): class NestedCableSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail')
class Meta: class Meta:

2
netbox/extras/models/models.py
View File

@ -285,7 +285,7 @@ class CustomLink(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
text = clean_html(text, allowed_schemes) text = clean_html(text, allowed_schemes)
# Sanitize link # Sanitize link
link = urllib.parse.quote_plus(link, safe='/:?&') link = urllib.parse.quote_plus(link, safe='/:?&=%+[]@#')
# Verify link scheme is allowed # Verify link scheme is allowed
result = urllib.parse.urlparse(link) result = urllib.parse.urlparse(link)

9
netbox/netbox/search/backends.py
View File

@ -145,9 +145,12 @@ class CachedValueSearchBackend(SearchBackend):
) )
# Omit any results pertaining to an object the user does not have permission to view # Omit any results pertaining to an object the user does not have permission to view
return [ ret = []
r for r in results if r.object is not None for r in results:
] if r.object is not None:
r.name = str(r.object)
ret.append(r)
return ret
def cache(self, instances, indexer=None, remove_existing=True): def cache(self, instances, indexer=None, remove_existing=True):
content_type = None content_type = None

3
netbox/netbox/tables/tables.py
View File

@ -219,7 +219,8 @@ class SearchTable(tables.Table):
order_by="object___meta__verbose_name", order_by="object___meta__verbose_name",
) )
object = tables.Column( object = tables.Column(
linkify=True linkify=True,
order_by=('name', )
) )
field = tables.Column() field = tables.Column()
value = tables.Column() value = tables.Column()