NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 12:12:53 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch 2021-08-30 10:05:12 -04:00
commit f5f74944dd
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/release-notes/version-2.11.md
View File

@ -1,5 +1,17 @@
# NetBox v2.11 # NetBox v2.11
## v2.11.13 (FUTURE)
### Enhancements
* [#7042](https://github.com/netbox-community/netbox/issues/7042) - Show count of journal entries in tab under object view
### Bug Fixes
* [#7019](https://github.com/netbox-community/netbox/issues/7019) - Enable searching VM interfaces by description
---
## v2.11.12 (2021-08-23) ## v2.11.12 (2021-08-23)
### Enhancements ### Enhancements

4
netbox/templates/generic/object.html
View File

@ -65,7 +65,9 @@
{% url journal_viewname pk=object.pk as journal_url %} {% url journal_viewname pk=object.pk as journal_url %}
{% if journal_url %} {% if journal_url %}
<li role="presentation" class="nav-item"> <li role="presentation" class="nav-item">
<a href="{{ journal_url }}" class="nav-link{% if active_tab == 'journal'%} active{% endif %}">Journal</a> <a href="{{ journal_url }}" class="nav-link{% if active_tab == 'journal'%} active{% endif %}">
Journal {% badge object.journal_entries.count %}
</a>
</li> </li>
{% endif %} {% endif %}
{% endwith %} {% endwith %}

3
netbox/virtualization/filtersets.py
View File

@ -275,5 +275,6 @@ class VMInterfaceFilterSet(PrimaryModelFilterSet):
if not value.strip(): if not value.strip():
return queryset return queryset
return queryset.filter( return queryset.filter(
Q(name__icontains=value) Q(name__icontains=value) |
Q(description__icontains=value)
) )