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

Merge pull request #1412 from umap-project/fix-usermaps-sql

Browse source 
Fix heavy request for getting user maps
This commit is contained in:
Yohan Boniface 2023-11-20 11:23:22 +01:00 committed by GitHub
commit 4b9f4cb056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
umap/views.py
View file

@ -205,13 +205,10 @@ class UserMaps(PaginatorMixin, DetailView):
return settings.UMAP_MAPS_PER_PAGE_OWNER return settings.UMAP_MAPS_PER_PAGE_OWNER
return settings.UMAP_MAPS_PER_PAGE return settings.UMAP_MAPS_PER_PAGE
def get_map_queryset(self):
return Map.objects if self.is_owner() else Map.public
def get_maps(self): def get_maps(self):
qs = self.get_map_queryset() qs = Map.public
qs = qs.filter(Q(owner=self.object) | Q(editors=self.object)) qs = qs.filter(owner=self.object).union(qs.filter(editors=self.object))
return qs.distinct().order_by("-modified_at") return qs.order_by("-modified_at")
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs.update({"maps": self.paginate(self.get_maps(), self.per_page)}) kwargs.update({"maps": self.paginate(self.get_maps(), self.per_page)})
@ -225,9 +222,8 @@ class UserStars(UserMaps):
template_name = "auth/user_stars.html" template_name = "auth/user_stars.html"
def get_maps(self): def get_maps(self):
qs = self.get_map_queryset()
stars = Star.objects.filter(by=self.object).values("map") stars = Star.objects.filter(by=self.object).values("map")
qs = qs.filter(pk__in=stars) qs = Map.public.filter(pk__in=stars)
return qs.order_by("-modified_at") return qs.order_by("-modified_at")