From 90008fbc3a0434fe8b28d7b9fd4f26e249c09c2f Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 9 Dec 2023 20:23:14 +0300 Subject: [PATCH 1/2] 0.3.1 contacts page and admin --- GeneralApp/models.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/GeneralApp/models.py b/GeneralApp/models.py index bdafab8..603082c 100644 --- a/GeneralApp/models.py +++ b/GeneralApp/models.py @@ -202,7 +202,9 @@ class Office(BaseModelViewPage): # footer_info = RichTextUploadingField(verbose_name=_('Информация в подвале'), null=True, blank=True) def __str__(self): - return self.name + if self.name: + return self.name + return self.address def save(self, *args, **kwargs): # self.order = 0 @@ -237,6 +239,12 @@ class Office(BaseModelViewPage): verbose_name_plural = _('Офисы') ordering = ['order', 'city', 'name'] +def preSave_Office(sender, instance, **kwargs): + if not instance.name: + instance.name = instance.office.name + instance.url = get_unique_url_for_new_instance(instance, sender) +pre_save.connect(preSave_Office, sender=Office, dispatch_uid='pre_save_connect') + contact_type_choice = ( ('phone', _('Телефон')), From 09e2169f7e7bf822607e1ef29f8e64b2916a66f2 Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 9 Dec 2023 20:29:11 +0300 Subject: [PATCH 2/2] 0.3.2 contacts page and admin --- GeneralApp/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneralApp/models.py b/GeneralApp/models.py index 603082c..945dcef 100644 --- a/GeneralApp/models.py +++ b/GeneralApp/models.py @@ -241,7 +241,7 @@ class Office(BaseModelViewPage): def preSave_Office(sender, instance, **kwargs): if not instance.name: - instance.name = instance.office.name + instance.name = instance.city instance.url = get_unique_url_for_new_instance(instance, sender) pre_save.connect(preSave_Office, sender=Office, dispatch_uid='pre_save_connect')