sysadminix/Aerbim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.0.15 block plugin

Browse Source
This commit is contained in:
SDE
2023-11-27 18:49:55 +03:00
parent 1234bc569b
commit 5f0a6bfc0a
17 changed files with 455 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GeneralApp/admin.py
View File

@@ -26,7 +26,7 @@ class Admin_Inline_WidgetForBlock(SuperInlineModelAdmin, Admin_Trans_BaseIconSta
'fields': [
('title', 'description', 'picture'),
('bg_color', ),
('but_title', 'but_color'),
('but_title', 'but_color', 'but_icon'),
('url', 'order'),
]
})
@@ -49,7 +49,7 @@ class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline, SuperI
'fields': [
('block_type', 'title', 'description', 'picture'),
('bg_color', ),
('but_title', 'but_color'),
('but_title', 'but_color', 'but_icon'),
('url',),
('child_in_row_count', 'order'),
]

18
GeneralApp/migrations/0008_alter_block_block_type.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 4.2.7 on 2023-11-27 16:25
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('GeneralApp', '0007_alter_widgetforblock_options_and_more'),
]
operations = [
migrations.AlterField(
model_name='block',
name='block_type',
field=models.CharField(choices=[('photo_n_text', 'Фото + текст'), ('photo150_n_title', 'Фото 150x150 + заголовок'), ('how_work', 'Как с нами работать')], default='photo_n_text', max_length=100, verbose_name='Тип блока'),
),
]

24
GeneralApp/migrations/0009_alter_block_picture_alter_staticpage_picture.py Normal file
View File

@@ -0,0 +1,24 @@
# Generated by Django 4.2.7 on 2023-11-27 17:13
import BaseModels.base_models
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('GeneralApp', '0008_alter_block_block_type'),
]
operations = [
migrations.AlterField(
model_name='block',
name='picture',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Картинка'),
),
migrations.AlterField(
model_name='staticpage',
name='picture',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Картинка'),
),
]

34
GeneralApp/migrations/0010_block_but_icon_widgetforblock_but_icon_and_more.py Normal file
View File

@@ -0,0 +1,34 @@
# Generated by Django 4.2.7 on 2023-11-27 17:28
import BaseModels.base_models
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('GeneralApp', '0009_alter_block_picture_alter_staticpage_picture'),
]
operations = [
migrations.AddField(
model_name='block',
name='but_icon',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Пиктограмма для кнопки'),
),
migrations.AddField(
model_name='widgetforblock',
name='but_icon',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Пиктограмма для кнопки'),
),
migrations.AlterField(
model_name='option',
name='picture',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Миниатюра'),
),
migrations.AlterField(
model_name='widgetforblock',
name='picture',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Картинка'),
),
]

40
GeneralApp/models.py
View File

@@ -1,5 +1,5 @@
from django.db import models
from BaseModels.base_models import BaseModelViewPage, BaseModel
from BaseModels.base_models import BaseModelViewPage, BaseModel, validate_file_extension
from django.utils.translation import gettext_lazy as _
# from ckeditor.fields import RichTextField
from ckeditor_uploader.fields import RichTextUploadingField
@@ -20,16 +20,27 @@ class StaticPage(BaseModelViewPage):
block_type_choices = (
('photo_n_text', _('Фото + текст')),
('photo150_n_title', _('Фото 150x150 + заголовок')),
('slider', _('Галерея слайдов')),
('how_work', _('Как с нами работать')),
# ('slider', _('Галерея слайдов')),
)
class Block(BaseModelViewPage):
class Block_Abstract(BaseModelViewPage):
class Meta:
verbose_name = _('Блок')
verbose_name_plural = _('Блоки')
abstract = True
class Block(Block_Abstract):
content_type = models.ForeignKey(ContentType, on_delete=models.SET_NULL, null=True)
object_id = models.PositiveIntegerField()
content_object = GenericForeignKey('content_type', 'object_id')
block_type = models.CharField(max_length=100, choices=block_type_choices, verbose_name=_('Тип блока'), default='photo_n_text')
block_type = models.CharField(max_length=100, choices=block_type_choices, verbose_name=_('Тип блока'),
default='photo_n_text')
url = models.TextField(verbose_name=_('URL привязанной страницы'), null=True, blank=True)
@@ -38,6 +49,11 @@ class Block(BaseModelViewPage):
but_title = models.CharField(max_length=100, verbose_name=_('Текст на кнопке'), null=True, blank=True)
but_color = ColorField(verbose_name=_('Цвет кнопки'), default='#000000')
but_icon = models.FileField(
upload_to='uploads/', verbose_name=_('Пиктограмма для кнопки'), null=True, blank=True,
validators=[validate_file_extension]
)
child_in_row_count = models.PositiveSmallIntegerField(
verbose_name=_('Количество дочерних элементов в строке'), default=3)
@@ -47,6 +63,10 @@ class Block(BaseModelViewPage):
class WidgetForBlock(BaseModel):
block = models.ForeignKey(
@@ -57,7 +77,8 @@ class WidgetForBlock(BaseModel):
title = models.TextField(verbose_name=_('Заголовок'), null=True, blank=True)
description = RichTextUploadingField(verbose_name=_('Краткое описание'), null=True, blank=True)
picture = models.ImageField(upload_to='uploads/', verbose_name=_('Картинка'), null=True, blank=True)
picture = models.FileField(upload_to='uploads/', verbose_name=_('Картинка'), null=True, blank=True,
validators=[validate_file_extension])
# block_type = models.CharField(max_length=100, choices=block_type_choices, verbose_name=_('Тип блока'), default='photo_n_text')
@@ -68,6 +89,11 @@ class WidgetForBlock(BaseModel):
but_title = models.CharField(max_length=100, verbose_name=_('Текст на кнопке'), null=True, blank=True)
but_color = ColorField(verbose_name=_('Цвет кнопки'), default='#000000')
but_icon = models.FileField(
upload_to='uploads/', verbose_name=_('Пиктограмма для кнопки'), null=True, blank=True,
validators=[validate_file_extension]
)
class Meta:
verbose_name = _('Виджет в блоке')
@@ -79,8 +105,8 @@ class Option(BaseModel):
opt_type = models.CharField(max_length=250, verbose_name=_('Тип'), blank=True, null=True)
prefix = models.CharField(max_length=250, verbose_name=_('Префикс'), blank=True, null=True)
value = models.CharField(max_length=250, verbose_name=_('Значение'))
picture = models.ImageField(upload_to='uploads/', verbose_name=_('Миниатюра'), null=True, blank=True,
help_text=u'')
picture = models.FileField(upload_to='uploads/', verbose_name=_('Миниатюра'), null=True, blank=True,
validators=[validate_file_extension])
class Meta:
verbose_name = _('Параметр')

8
GeneralApp/validators.py Normal file
View File

@@ -0,0 +1,8 @@
import os
from django.core.exceptions import ValidationError
def validate_file_extension(value):
ext = os.path.splitext(value.name)[1]
valid_extensions = ['.jpg', '.jpeg', '.png', '.svg']
if not ext.lower() in valid_extensions:
raise ValidationError('Unsupported file extension.')