0.0.30 3th section main_block_w_subblocks

GeneralApp/admin.py

@@ -119,10 +119,27 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
 admin.site.register(StaticPage,Admin_StaticPage)
 
 class Admin_Block(Admin_Trans_BaseModelViewPage):
+    fieldsets = [
+        (None, {
+            'classes': [],
+            'fields': [
+                ('block_type',
+                 # 'title',
+                 'name', 'description', 'picture'),
+                ('bg_color', 'bg_image'),
+                ('but_title', 'but_color', 'but_icon'),
+                ('url',),
+                ('child_in_row_count', 'order'),
+            ]
+        })
+    ]
 
+    inlines = [Admin_Inline_WidgetForBlock]
 
-
-    inlines = [Admin_StackedInline_Block]
+    list_display = ['name', 'block_type', 'enable', 'content_type', 'object_id']
+    list_editable = ['enable']
+    search_fields = ['name']
+    list_filter = ['block_type', 'enable', 'content_type']
 
     def has_delete_permission(self, request, obj=None):
         if request.user.is_superuser:
@@ -131,7 +148,7 @@ class Admin_Block(Admin_Trans_BaseModelViewPage):
         if obj.name in ('About US', 'machines', 'works'):
             return False
 
-admin.site.register(Block,Admin_Block)
+admin.site.register(Block, Admin_Block)
 
 class Admin_Option(Admin_Trans_BaseModel):
 

GeneralApp/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from BaseModels.base_models import BaseModelViewPage, BaseModel, validate_file_extension
+from BaseModels.base_models import *
 from django.utils.translation import gettext_lazy as _
 # from ckeditor.fields import RichTextField
 from ckeditor_uploader.fields import RichTextUploadingField
@@ -16,9 +16,14 @@ class StaticPage(BaseModelViewPage):
         verbose_name = _('Статическая страница')
         verbose_name_plural = _('Статические страницы')
 
+def preSave_StaticPage(sender, instance, **kwargs):
+    instance.url = get_unique_url_for_new_instance(instance, sender)
+pre_save.connect(preSave_StaticPage, sender=StaticPage, dispatch_uid='pre_save_connect')
+
 
 block_type_choices = (
     ('photo_n_text', _('Фото с одной стороны + Текст с другой стороны')),
+    ('main_block_w_subblocks', _('Блок с подблоками')),
     ('present_technology_block', _('описание и НАЗВАНИЕ слева + Картинка справа')),
     ('photo150_n_title', _('Фото 150x150 сверху + заголовок под фото')),
     ('how_work', _('Как с нами работать')),
@@ -65,12 +70,18 @@ class Block(Block_Abstract):
     child_in_row_count = models.PositiveSmallIntegerField(
         verbose_name=_('Количество дочерних элементов в строке'), default=3)
 
+
+    def get_widgets(self):
+        return self.rel_widgets_for_block.filter(enable=True).order_by('order')
+
     class Meta:
         verbose_name = _('Блок на странице')
         verbose_name_plural = _('Блоки на странице')
 
 
-
+def preSave_Block(sender, instance, **kwargs):
+    instance.url = get_unique_url_for_new_instance(instance, sender)
+pre_save.connect(preSave_Block, sender=Block, dispatch_uid='pre_save_connect')