NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes for anonimous user

Browse Source 
Added check if user is authenticated
Deleted debbuging output
This commit is contained in:
ogorov 2020-12-23 14:25:31 +03:00
parent 5ca574d346
commit 58c06aad5a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/dcim/views.py
View File

@ -328,6 +328,8 @@ class RackElevationListView(generic.ObjectListView):
if rack_face not in DeviceFaceChoices.values(): if rack_face not in DeviceFaceChoices.values():
rack_face = DeviceFaceChoices.FACE_FRONT rack_face = DeviceFaceChoices.FACE_FRONT
user_config = request.user.config if request.user.is_authenticated else {}
return render(request, 'dcim/rack_elevation_list.html', { return render(request, 'dcim/rack_elevation_list.html', {
'paginator': paginator, 'paginator': paginator,
'page': page, 'page': page,
@ -365,7 +367,8 @@ class RackView(generic.ObjectView):
device_count = Device.objects.restrict(request.user, 'view').filter(rack=instance).count() device_count = Device.objects.restrict(request.user, 'view').filter(rack=instance).count()
print(request.user.config.get('rack_elevation.show_images')) user_config = request.user.config if request.user.is_authenticated else {}
return { return {
'device_count': device_count, 'device_count': device_count,
'reservations': reservations, 'reservations': reservations,

1
netbox/utilities/utils.py
View File

@ -174,7 +174,6 @@ def deepmerge(original, new):
Deep merge two dictionaries (new into original) and return a new dict Deep merge two dictionaries (new into original) and return a new dict
""" """
merged = OrderedDict(original) merged = OrderedDict(original)
print(original, new)
for key, val in new.items(): for key, val in new.items():
if key in original and isinstance(original[key], dict) and isinstance(val, dict): if key in original and isinstance(original[key], dict) and isinstance(val, dict):
merged[key] = deepmerge(original[key], val) merged[key] = deepmerge(original[key], val)