From 58e1a285b04af0fe3d252a1d7c524110bee023c3 Mon Sep 17 00:00:00 2001
From: erjemin <erjemin@gmaill.com>
Date: Wed, 4 Aug 2021 20:32:29 +0300
Subject: [PATCH] minor (tested)

---
 cadpoint/web/admin.py  | 11 ++++++++---
 cadpoint/web/models.py |  5 +++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cadpoint/web/admin.py b/cadpoint/web/admin.py
index ee8d986..6f96713 100644
--- a/cadpoint/web/admin.py
+++ b/cadpoint/web/admin.py
@@ -22,9 +22,14 @@ class AdminContent(admin.ModelAdmin):
     # Настройка страницы редактирования
     fieldsets = [
         (None, {
-            'fields': ('bContentPublish', 'tdContentPublishUp', 'tdContentPublishDown', 'tags',
-                       'szContentHead', 'imgContentPreview', 'szContentIntro',
-                       'szContentBody')
+            'fields': ('bContentPublish', 'tdContentPublishUp')
+        }),
+        ('Окончание публикации', {
+            'fields': ('tdContentPublishDown',),
+            'classes': ('collapse',),
+        }),
+        (None, {
+            'fields': ('tags', 'szContentHead', 'imgContentPreview', 'szContentIntro', 'szContentBody')
         }),
         ('Типограф', {
             'fields': ('bTypograf', ),
diff --git a/cadpoint/web/models.py b/cadpoint/web/models.py
index b794f7a..2aeb48b 100644
--- a/cadpoint/web/models.py
+++ b/cadpoint/web/models.py
@@ -164,12 +164,13 @@ class TbContent(models.Model):
 
     def save(self, *args, **kwargs):
         # переопределяем метод save() чтобы "проверуть" тексты через типографы...
-        if self.szContentSlug is None or " " in self.szContentSlug:
+        if self.szContentSlug is None or self.szContentSlug == "" or " " in self.szContentSlug:
+            print("ку-ку", self.szContentHead)
             result_slug = pytils.translit.slugify(
                 safe_html_special_symbols(self.szContentHead)).lower()
             while TbContent.objects.filter(szContentSlug=result_slug).count() != 0:
                 result_slug = "%s-%x" % (result_slug[0: -3], int(random.uniform(0, 255)))
-            self.szPointSlug = result_slug
+            self.szContentSlug = result_slug
         if self.bTypograf:
             # Используем типограф Eugene Spearance (https://www.typograf.ru) через API
             # Настройки стиля типографики см. тут: https://www.typograf.ru/webservice/about/