jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Map.BLOCKED share status

Browse source
This commit is contained in:
Yohan Boniface 2019-04-07 11:12:38 +02:00
parent 7e38a08fb8
commit 5b8a8904cc
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
umap/models.py
View file

@ -110,6 +110,7 @@ class Map(NamedModel):
PUBLIC = 1 PUBLIC = 1
OPEN = 2 OPEN = 2
PRIVATE = 3 PRIVATE = 3
BLOCKED = 9
EDIT_STATUS = ( EDIT_STATUS = (
(ANONYMOUS, _('Everyone can edit')), (ANONYMOUS, _('Everyone can edit')),
(EDITORS, _('Only editors can edit')), (EDITORS, _('Only editors can edit')),
@ -119,6 +120,7 @@ class Map(NamedModel):
(PUBLIC, _('everyone (public)')), (PUBLIC, _('everyone (public)')),
(OPEN, _('anyone with link')), (OPEN, _('anyone with link')),
(PRIVATE, _('editors only')), (PRIVATE, _('editors only')),
(BLOCKED, _('blocked')),
) )
slug = models.SlugField(db_index=True) slug = models.SlugField(db_index=True)
description = models.TextField(blank=True, null=True, verbose_name=_("description")) description = models.TextField(blank=True, null=True, verbose_name=_("description"))
@ -182,7 +184,9 @@ class Map(NamedModel):
return can return can
def can_view(self, request): def can_view(self, request):
if self.owner is None: if self.share_status == self.BLOCKED:
can = False
elif self.owner is None:
can = True can = True
elif self.share_status in [self.PUBLIC, self.OPEN]: elif self.share_status in [self.PUBLIC, self.OPEN]:
can = True can = True

17
umap/tests/test_map_views.py
View file

@ -265,6 +265,23 @@ def test_editors_can_access_map_with_share_status_private(client, map, user):
assert response.status_code == 200 assert response.status_code == 200
def test_anonymous_cannot_access_map_with_share_status_blocked(client, map):
url = reverse('map', args=(map.slug, map.pk))
map.share_status = map.BLOCKED
map.save()
response = client.get(url)
assert response.status_code == 403
def test_owner_cannot_access_map_with_share_status_blocked(client, map):
url = reverse('map', args=(map.slug, map.pk))
map.share_status = map.BLOCKED
map.save()
client.login(username=map.owner.username, password="123123")
response = client.get(url)
assert response.status_code == 403
def test_non_editor_cannot_access_map_if_share_status_private(client, map, user): # noqa def test_non_editor_cannot_access_map_if_share_status_private(client, map, user): # noqa
url = reverse('map', args=(map.slug, map.pk)) url = reverse('map', args=(map.slug, map.pk))
map.share_status = map.PRIVATE map.share_status = map.PRIVATE

2
umap/views.py
View file

@ -369,7 +369,7 @@ class MapDetailMixin:
'licences': dict((l.name, l.json) for l in Licence.objects.all()), 'licences': dict((l.name, l.json) for l in Licence.objects.all()),
'edit_statuses': [(i, str(label)) for i, label in Map.EDIT_STATUS], 'edit_statuses': [(i, str(label)) for i, label in Map.EDIT_STATUS],
'share_statuses': [(i, str(label)) 'share_statuses': [(i, str(label))
for i, label in Map.SHARE_STATUS], for i, label in Map.SHARE_STATUS if i != Map.BLOCKED],
'anonymous_edit_statuses': [(i, str(label)) for i, label 'anonymous_edit_statuses': [(i, str(label)) for i, label
in AnonymousMapPermissionsForm.STATUS], in AnonymousMapPermissionsForm.STATUS],
} }