0.4.43 title and description

GeneralApp/models.py

@@ -203,9 +203,15 @@ class Office(BaseModelViewPage):
     # footer_info = RichTextUploadingField(verbose_name=_('Информация в подвале'), null=True, blank=True)
 
     def __str__(self):
-        if self.name:
-            return self.name
-        return self.address
+        name_list = []
+        if self.city:
+            name_list.append(self.city)
+        if self.address:
+            name_list.append(self.address)
+        if name_list:
+            return ' '.join(name_list)
+
+        return self.id
 
     def save(self, *args, **kwargs):
         # self.order = 0