Merge branch 'bug/establishment-country' into 'develop'

fix country_id See merge request gm/gm-backend!233
2020-01-22 16:55:50 +00:00 · 2020-01-22 16:55:50 +00:00 · f5e60f0609
commit f5e60f0609
parent affb985b15 24c352aeac
1 changed files with 1 additions and 1 deletions
--- a/apps/establishment/models.py
+++ b/apps/establishment/models.py
@ -764,7 +764,7 @@ class Establishment(GalleryMixin, ProjectBaseMixin, URLImageMixin,
        """
        Return Country id of establishment location
        """
-        return self.address.country_id
+        return self.address.country_id if hasattr(self.address, 'country_id') else None

    @property
    def establishment_id(self):