Merge pull request #5254 from onepercentclub/hotfix/location-without-…

…position

Fix user location missing position

bluebottle/activities/serializers.py

@@ -178,15 +178,19 @@ def get_matching_properties(self, obj):
             self.context['themes'] = [theme.pk for theme in user.favourite_themes.all()]
 
         if 'location' not in self.context:
-            self.context['location'] = user.location or user.place
+            if user.location and user.location.position:
+                self.context['location'] = user.location
+
+            if user.place and user.place.position:
+                self.context['location'] = user.place
 
         matching = {'location': False}
         matching['skill'] = obj.expertise[0].id in self.context['skills'] if obj.expertise else False
         matching['theme'] = obj.theme[0].id in self.context['themes'] if obj.theme else False
 
         if obj.is_online:
             matching['location'] = True
-        elif self.context['location'] and obj.position:
+        elif 'location' in self.context and obj.position:
             positions = [obj.position] if 'lat' in obj.position else obj.position
 
             dist = min(