Merge pull request #1530 from the-deep/fix/remove-geo-tag-from-entry

Filter project wise geo widgets in entry tags
the-deep · Oct 2, 2024 · 0e189e2 · 0e189e2
2 parents 7e441e0 + 0fab674
commit 0e189e2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/apps/entry/dataloaders.py b/apps/entry/dataloaders.py
@@ -15,6 +15,7 @@
     Attribute,
     EntryGroupLabel,
 )
+from geo.models import GeoArea
 
 
 class EntryLoader(DataLoaderWithContext):
@@ -52,7 +53,9 @@ def batch_load_fn(self, keys):
 
 class AttributeGeoSelectedOptionsLoader(DataLoaderWithContext):
     def batch_load_fn(self, keys):
-        geo_area_qs = get_geo_area_queryset_for_project_geo_area_type().filter(
+        geo_area_qs = get_geo_area_queryset_for_project_geo_area_type(
+            queryset=GeoArea.get_for_project(self.context.active_project)
+        ).filter(
             id__in={id for ids in keys for id in ids}
         ).defer('polygons')
         geo_area_map = {