Skip to content

Commit

Permalink
Merge pull request #12366 from netbox-community/develop
Browse files Browse the repository at this point in the history
Release v3.4.10
  • Loading branch information
jeremystretch authored Apr 27, 2023
2 parents f867cb3 + 84089ab commit 72767fb
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ body:
attributes:
label: NetBox version
description: What version of NetBox are you currently running?
placeholder: v3.4.9
placeholder: v3.4.10
validations:
required: true
- type: dropdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ body:
attributes:
label: NetBox version
description: What version of NetBox are you currently running?
placeholder: v3.4.9
placeholder: v3.4.10
validations:
required: true
- type: dropdown
Expand Down
10 changes: 10 additions & 0 deletions docs/release-notes/version-3.4.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# 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)

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion netbox/dcim/api/nested_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ class Meta:
# Cables
#

class NestedCableSerializer(BaseModelSerializer):
class NestedCableSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail')

class Meta:
Expand Down
2 changes: 1 addition & 1 deletion netbox/extras/models/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def render(self, context):
text = clean_html(text, allowed_schemes)

# Sanitize link
link = urllib.parse.quote_plus(link, safe='/:?&')
link = urllib.parse.quote_plus(link, safe='/:?&=%+[]@#')

# Verify link scheme is allowed
result = urllib.parse.urlparse(link)
Expand Down
9 changes: 6 additions & 3 deletions netbox/netbox/search/backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,12 @@ def search(self, value, user=None, object_types=None, lookup=DEFAULT_LOOKUP_TYPE
)

# Omit any results pertaining to an object the user does not have permission to view
return [
r for r in results if r.object is not None
]
ret = []
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):
content_type = None
Expand Down
2 changes: 1 addition & 1 deletion netbox/netbox/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# Environment setup
#

VERSION = '3.4.9'
VERSION = '3.4.10'

# Hostname
HOSTNAME = platform.node()
Expand Down
3 changes: 2 additions & 1 deletion netbox/netbox/tables/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ class SearchTable(tables.Table):
order_by="object___meta__verbose_name",
)
object = tables.Column(
linkify=True
linkify=True,
order_by=('name', )
)
field = tables.Column()
value = tables.Column()
Expand Down

0 comments on commit 72767fb

Please sign in to comment.