From db505809eed3b310eec354156e7c1d2a990d80d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Wed, 21 Dec 2016 22:12:40 +0100 Subject: [PATCH] fix get_includables_avoidables --- src/c3nav/mapdata/inclusion.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/c3nav/mapdata/inclusion.py b/src/c3nav/mapdata/inclusion.py index 73d57b05..b632692a 100644 --- a/src/c3nav/mapdata/inclusion.py +++ b/src/c3nav/mapdata/inclusion.py @@ -31,16 +31,11 @@ def get_includables_avoidables(request): includables.append((':nonpublic', _('non-public areas'))) avoidables.append((':public', _('public areas'))) - from c3nav.access.apply import can_access_package - for location in locations: item = (location.location_id, location.title) - if not can_access_package(request, location.package): - continue - - if location.routing_inclusion == 'needs_permission': - if not request.c3nav_full_access and location.location_id not in request.c3nav_access_list: + if not location.location_id not in request.c3nav_access_list and not request.c3nav_full_access: + if location.routing_inclusion == 'needs_permission': continue if location.routing_inclusion == 'allow_avoid':