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

Merge pull request #1331 from umap-project/fix-anonymap-in-dasboard

Browse source 
Fix anonymous maps displayed by mistake in user dashboard
This commit is contained in:
David Larlet 2023-09-22 13:50:19 -04:00 committed by GitHub
commit a508ca792b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
umap/tests/test_views.py
View file

@ -11,7 +11,7 @@ from django.test import RequestFactory
from umap import VERSION from umap import VERSION
from umap.views import validate_url from umap.views import validate_url
from .base import UserFactory from .base import UserFactory, MapFactory
User = get_user_model() User = get_user_model()
@ -288,6 +288,7 @@ def test_user_dashboard_display_user_maps(client, map):
@pytest.mark.django_db @pytest.mark.django_db
def test_user_dashboard_display_user_maps_distinct(client, map): def test_user_dashboard_display_user_maps_distinct(client, map):
# cf https://github.com/umap-project/umap/issues/1325 # cf https://github.com/umap-project/umap/issues/1325
anonymap = MapFactory(name="Map witout owner should not appear")
user1 = UserFactory(username='user1') user1 = UserFactory(username='user1')
user2 = UserFactory(username='user2') user2 = UserFactory(username='user2')
map.editors.add(user1) map.editors.add(user1)
@ -298,6 +299,7 @@ def test_user_dashboard_display_user_maps_distinct(client, map):
assert response.status_code == 200 assert response.status_code == 200
body = response.content.decode() body = response.content.decode()
assert body.count(map.name) == 1 assert body.count(map.name) == 1
assert body.count(anonymap.name) == 0
@pytest.mark.django_db @pytest.mark.django_db

2
umap/views.py
View file

@ -277,7 +277,7 @@ class UserDashboard(PaginatorMixin, DetailView, SearchMixin):
def get_maps(self): def get_maps(self):
qs = self.get_search_queryset() or Map.objects.all() qs = self.get_search_queryset() or Map.objects.all()
qs = qs.union(qs.filter(owner=self.object), qs.filter(editors=self.object)) qs = qs.filter(owner=self.object).union(qs.filter(editors=self.object))
return qs.order_by("-modified_at") return qs.order_by("-modified_at")
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):