mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-23 12:08:43 -06:00
Compare commits
1 Commits
21242-admi
...
21254-attr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a320df9926 |
@@ -409,10 +409,60 @@ ADMIN_MENU = Menu(
|
|||||||
MenuGroup(
|
MenuGroup(
|
||||||
label=_('Authentication'),
|
label=_('Authentication'),
|
||||||
items=(
|
items=(
|
||||||
get_model_item('users', 'user', _('Users')),
|
MenuItem(
|
||||||
get_model_item('users', 'group', _('Groups')),
|
link='users:user_list',
|
||||||
get_model_item('users', 'token', _('API Tokens')),
|
link_text=_('Users'),
|
||||||
get_model_item('users', 'objectpermission', _('Permissions'), actions=['add']),
|
staff_only=True,
|
||||||
|
permissions=['users.view_user'],
|
||||||
|
buttons=(
|
||||||
|
MenuItemButton(
|
||||||
|
link='users:user_add',
|
||||||
|
title='Add',
|
||||||
|
icon_class='mdi mdi-plus-thick',
|
||||||
|
permissions=['users.add_user']
|
||||||
|
),
|
||||||
|
MenuItemButton(
|
||||||
|
link='users:user_bulk_import',
|
||||||
|
title='Import',
|
||||||
|
icon_class='mdi mdi-upload',
|
||||||
|
permissions=['users.add_user']
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
MenuItem(
|
||||||
|
link='users:group_list',
|
||||||
|
link_text=_('Groups'),
|
||||||
|
staff_only=True,
|
||||||
|
permissions=['users.view_group'],
|
||||||
|
buttons=(
|
||||||
|
MenuItemButton(
|
||||||
|
link='users:group_add',
|
||||||
|
title='Add',
|
||||||
|
icon_class='mdi mdi-plus-thick',
|
||||||
|
permissions=['users.add_group']
|
||||||
|
),
|
||||||
|
MenuItemButton(
|
||||||
|
link='users:group_bulk_import',
|
||||||
|
title='Import',
|
||||||
|
icon_class='mdi mdi-upload',
|
||||||
|
permissions=['users.add_group']
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
MenuItem(
|
||||||
|
link='users:token_list',
|
||||||
|
link_text=_('API Tokens'),
|
||||||
|
staff_only=True,
|
||||||
|
permissions=['users.view_token'],
|
||||||
|
buttons=get_model_buttons('users', 'token')
|
||||||
|
),
|
||||||
|
MenuItem(
|
||||||
|
link='users:objectpermission_list',
|
||||||
|
link_text=_('Permissions'),
|
||||||
|
staff_only=True,
|
||||||
|
permissions=['users.view_objectpermission'],
|
||||||
|
buttons=get_model_buttons('users', 'objectpermission', actions=['add'])
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
MenuGroup(
|
MenuGroup(
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import re
|
import re
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
import logging
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
@@ -28,6 +29,8 @@ __all__ = (
|
|||||||
'SearchView',
|
'SearchView',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
logger = logging.getLogger(f'netbox.{__name__}')
|
||||||
|
|
||||||
Link = namedtuple('Link', ('label', 'viewname', 'permission', 'count'))
|
Link = namedtuple('Link', ('label', 'viewname', 'permission', 'count'))
|
||||||
|
|
||||||
|
|
||||||
@@ -50,7 +53,14 @@ class HomeView(ConditionalLoginRequiredMixin, View):
|
|||||||
# Check whether a new release is available. (Only for superusers.)
|
# Check whether a new release is available. (Only for superusers.)
|
||||||
new_release = None
|
new_release = None
|
||||||
if request.user.is_superuser:
|
if request.user.is_superuser:
|
||||||
latest_release = cache.get('latest_release')
|
# cache.get() can raise if the cached value can't be unpickled after dependency upgrades
|
||||||
|
try:
|
||||||
|
latest_release = cache.get('latest_release')
|
||||||
|
except Exception:
|
||||||
|
logger.debug("Failed to read 'latest_release' from cache; deleting key", exc_info=True)
|
||||||
|
cache.delete('latest_release')
|
||||||
|
latest_release = None
|
||||||
|
|
||||||
if latest_release:
|
if latest_release:
|
||||||
release_version, release_url = latest_release
|
release_version, release_url = latest_release
|
||||||
if release_version > version.parse(settings.RELEASE.version):
|
if release_version > version.parse(settings.RELEASE.version):
|
||||||
|
|||||||
Reference in New Issue
Block a user