diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 541757742..2741cf16d 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -243,17 +243,17 @@ class HomeView(View): } + # Check whether a new release is available. (Only for staff/superusers.) new_release = None - new_release_url = None - if request.user.is_staff or request.user.is_superuser: - # Only check for new releases if the current user might be able to do anything about it - latest_release, github_url = get_latest_release() + latest_release, release_url = get_latest_release() if isinstance(latest_release, version.Version): current_version = version.parse(settings.VERSION) if latest_release > current_version: - new_release = str(latest_release) - new_release_url = github_url + new_release = { + 'version': str(latest_release), + 'url': release_url, + } return render(request, self.template_name, { 'search_form': SearchForm(), @@ -261,7 +261,6 @@ class HomeView(View): 'report_results': ReportResult.objects.order_by('-created')[:10], 'changelog': ObjectChange.objects.prefetch_related('user', 'changed_object_type')[:15], 'new_release': new_release, - 'new_release_url': new_release_url, }) diff --git a/netbox/templates/home.html b/netbox/templates/home.html index 77a559e77..d3885b88f 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -3,13 +3,14 @@ {% block header %} {{ block.super }} - {% if new_release %}{% if request.user.is_staff or request.user.is_superuser %} + {% if new_release %} + {# new_release is set only if the current user is a superuser or staff member #} - {% endif %}{% endif %} + {% endif %} {% endblock %}