2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

respect access restrictions in child_model() count

Browse source
This commit is contained in:
Laura Klünder 2017-07-13 23:52:49 +02:00
parent 506cf7cc60
commit a87d131134
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/c3nav/editor/views/edit.py
View file

@ -9,12 +9,16 @@ from django.utils.translation import ugettext_lazy as _
from c3nav.editor.views.base import sidebar_view from c3nav.editor.views.base import sidebar_view
def child_model(model, kwargs=None, parent=None): def child_model(request, model, kwargs=None, parent=None):
model = request.changeset.wrap_model(model)
related_name = model._meta.default_related_name related_name = model._meta.default_related_name
qs = getattr(parent, related_name)
if hasattr(model, 'q_for_request'):
qs = qs.filter(model.q_for_request(request))
return { return {
'title': model._meta.verbose_name_plural, 'title': model._meta.verbose_name_plural,
'url': reverse('editor.'+related_name+'.list', kwargs=kwargs), 'url': reverse('editor.'+related_name+'.list', kwargs=kwargs),
'count': None if parent is None else getattr(parent, related_name).count(), 'count': None if parent is None else qs.count(),
} }
@ -25,10 +29,10 @@ def main_index(request):
'levels': Level.objects.filter(Level.q_for_request(request), on_top_of__isnull=True), 'levels': Level.objects.filter(Level.q_for_request(request), on_top_of__isnull=True),
'can_edit': request.changeset.can_edit(request), 'can_edit': request.changeset.can_edit(request),
'child_models': [ 'child_models': [
child_model(request.changeset.wrap_model('LocationGroupCategory')), child_model(request, 'LocationGroupCategory'),
child_model(request.changeset.wrap_model('LocationGroup')), child_model(request, 'LocationGroup'),
child_model(request.changeset.wrap_model('AccessRestriction')), child_model(request, 'AccessRestriction'),
child_model(request.changeset.wrap_model('Source')), child_model(request, 'Source'),
], ],
}) })
@ -46,7 +50,7 @@ def level_detail(request, pk):
'level_as_pk': True, 'level_as_pk': True,
'can_edit': request.changeset.can_edit(request), 'can_edit': request.changeset.can_edit(request),
'child_models': [child_model(request.changeset.wrap_model(model_name), kwargs={'level': pk}, parent=level) 'child_models': [child_model(request, model_name, kwargs={'level': pk}, parent=level)
for model_name in ('Building', 'Space', 'Door')], for model_name in ('Building', 'Space', 'Door')],
'levels_on_top': level.levels_on_top.filter(Level.q_for_request(request)).all(), 'levels_on_top': level.levels_on_top.filter(Level.q_for_request(request)).all(),
'geometry_url': '/api/editor/geometries/?level='+str(level.primary_level_pk), 'geometry_url': '/api/editor/geometries/?level='+str(level.primary_level_pk),
@ -64,7 +68,7 @@ def space_detail(request, level, pk):
'space': space, 'space': space,
'can_edit': request.changeset.can_edit(request), 'can_edit': request.changeset.can_edit(request),
'child_models': [child_model(request.changeset.wrap_model(model_name), kwargs={'space': pk}, parent=space) 'child_models': [child_model(request, model_name, kwargs={'space': pk}, parent=space)
for model_name in ('Hole', 'Area', 'Stair', 'Obstacle', 'LineObstacle', 'Column', 'POI')], for model_name in ('Hole', 'Area', 'Stair', 'Obstacle', 'LineObstacle', 'Column', 'POI')],
'geometry_url': '/api/editor/geometries/?space='+pk, 'geometry_url': '/api/editor/geometries/?space='+pk,
}) })