From 58c06aad5a36f4df97515bb52897ec092174d57a Mon Sep 17 00:00:00 2001 From: ogorov Date: Wed, 23 Dec 2020 14:25:31 +0300 Subject: [PATCH] Fixes for anonimous user Added check if user is authenticated Deleted debbuging output --- netbox/dcim/views.py | 5 ++++- netbox/utilities/utils.py | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index a066ffd61..c75dc815b 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -328,6 +328,8 @@ class RackElevationListView(generic.ObjectListView): if rack_face not in DeviceFaceChoices.values(): rack_face = DeviceFaceChoices.FACE_FRONT + user_config = request.user.config if request.user.is_authenticated else {} + return render(request, 'dcim/rack_elevation_list.html', { 'paginator': paginator, 'page': page, @@ -365,7 +367,8 @@ class RackView(generic.ObjectView): 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 { 'device_count': device_count, 'reservations': reservations, diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index aa9724704..d76b469b2 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -174,7 +174,6 @@ def deepmerge(original, new): Deep merge two dictionaries (new into original) and return a new dict """ merged = OrderedDict(original) - print(original, new) for key, val in new.items(): if key in original and isinstance(original[key], dict) and isinstance(val, dict): merged[key] = deepmerge(original[key], val)