Fix precise display of related items

1 files changed, 4 insertions, 5 deletions

diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 0afe9da9e..65b90157e 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -2592,7 +2592,8 @@ class GeoItem(models.Model):
         current_source = str(self.__class__._meta.verbose_name)
         if self.multi_polygon_source_item == current_source \
                 and (self.multi_polygon_source == "P" or
-                     self.point_source_item != current_source):
+                     (self.point_source_item != current_source and
+                      self.point_source != "P")):
             return 'multi_polygon'
         if self.point_source_item == current_source \
                 and self.point_source == 'P':
@@ -2609,20 +2610,18 @@ class GeoItem(models.Model):
     def geo_point_source(self):
         if not self.point_source:
             return ""
-        src = "{} - {}".format(
+        return "{} - {}".format(
             dict(self.GEO_SOURCE)[self.point_source],
             self.point_source_item
         )
-        return src
 
     def geo_polygon_source(self):
         if not self.multi_polygon_source:
             return ""
-        src = "{} - {}".format(
+        return "{} - {}".format(
             dict(self.GEO_SOURCE)[self.multi_polygon_source],
             self.multi_polygon_source_item
         )
-        return src
 
     def _geojson_serialize(self, geom_attr):
         if not hasattr(self, geom_attr):