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

30
ServicesApp/admin.py
View File

@@ -16,6 +16,30 @@ def sets_for_formfield_for_dbfield(field, db_field):
class Admin_StackedInline_BlockPluginPresentation(Admin_Trans_GenericBaseIconStackedInline):
# class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline):
def formfield_for_dbfield(self, db_field, request, **kwargs):
field = super(Admin_StackedInline_BlockPluginPresentation, self).formfield_for_dbfield(db_field, request, **kwargs)
return sets_for_formfield_for_dbfield(field, db_field)
model = BlockPluginPresentation
extra = 0
max_num = 1
fieldsets = [
(None, {
'classes': [],
'fields': [
'pre_title', 'title', 'name', 'description', 'picture',
('but1_title', 'but1_icon', 'but1_url'),
('but2_title', 'but2_icon', 'but2_url'),
# ('order',),
]
})
]
# class Admin_StaticPage(NestedModelAdmin, Admin_Trans_BaseModelViewPage):
class Admin_Section(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
@@ -54,7 +78,11 @@ class Admin_Section(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
search_fields = ['name', 'title']
# filter_horizontal = ['options']
inlines = [Admin_StackedInline_Slide, Admin_StackedInline_Block]
inlines = [
Admin_StackedInline_Slide,
Admin_StackedInline_BlockPluginPresentation,
Admin_StackedInline_Block
]
def has_delete_permission(self, request, obj=None):
if request.user.is_superuser:

65
ServicesApp/migrations/0003_blockpluginpresentation.py Normal file
View File

@@ -0,0 +1,65 @@
# Generated by Django 4.2.7 on 2023-11-27 16:25
import ckeditor_uploader.fields
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('contenttypes', '0002_remove_content_type_name'),
('ServicesApp', '0002_alter_service_url'),
]
operations = [
migrations.CreateModel(
name='BlockPluginPresentation',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название')),
('name_ru', models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название')),
('name_en', models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название')),
('name_plural', models.TextField(blank=True, null=True, verbose_name='Название (множественное число)')),
('order', models.IntegerField(blank=True, null=True, verbose_name='Очередность отображения')),
('createDT', models.DateTimeField(auto_now_add=True, verbose_name='Дата и время создания')),
('modifiedDT', models.DateTimeField(blank=True, null=True, verbose_name='Дата и время последнего изменения')),
('enable', models.BooleanField(db_index=True, default=True, verbose_name='Включено')),
('json_data', models.JSONField(blank=True, default=dict, verbose_name='Дополнительные данные')),
('url', models.TextField(help_text='можно изменить адрес страницы (!!! ВНИМАНИЕ !!! поисковые системы потеряют страницу и найдут лишь спустя неделю...месяц)', unique=True, verbose_name='URL привязанной страницы')),
('title', models.TextField(blank=True, null=True, verbose_name='Заголовок')),
('title_ru', models.TextField(blank=True, null=True, verbose_name='Заголовок')),
('title_en', models.TextField(blank=True, null=True, verbose_name='Заголовок')),
('description', ckeditor_uploader.fields.RichTextUploadingField(blank=True, help_text='краткое описание страницы (до 240 символов)', null=True, verbose_name='Краткое описание')),
('description_ru', ckeditor_uploader.fields.RichTextUploadingField(blank=True, help_text='краткое описание страницы (до 240 символов)', null=True, verbose_name='Краткое описание')),
('description_en', ckeditor_uploader.fields.RichTextUploadingField(blank=True, help_text='краткое описание страницы (до 240 символов)', null=True, verbose_name='Краткое описание')),
('text', ckeditor_uploader.fields.RichTextUploadingField(blank=True, null=True, verbose_name='Полное описание')),
('text_ru', ckeditor_uploader.fields.RichTextUploadingField(blank=True, null=True, verbose_name='Полное описание')),
('text_en', ckeditor_uploader.fields.RichTextUploadingField(blank=True, null=True, verbose_name='Полное описание')),
('picture', models.ImageField(blank=True, null=True, upload_to='uploads/', verbose_name='Картинка')),
('visible', models.BooleanField(default=True, verbose_name='Отображать')),
('seo_title', models.CharField(blank=True, max_length=250, null=True, verbose_name='Title (80 знаков)')),
('seo_description', models.CharField(blank=True, max_length=250, null=True, verbose_name='Description (150 знаков)')),
('seo_keywords', models.CharField(blank=True, max_length=250, null=True, verbose_name='Keywords (200 знаков)')),
('seo_text', ckeditor_uploader.fields.RichTextUploadingField(blank=True, null=True, verbose_name='Текст SEO статьи')),
('FAQ_title', models.CharField(blank=True, max_length=250, null=True, verbose_name='FAQ Заголовок')),
('object_id', models.PositiveIntegerField()),
('pre_title', models.CharField(blank=True, max_length=250, null=True, verbose_name='Текст перед заголовком')),
('pre_title_ru', models.CharField(blank=True, max_length=250, null=True, verbose_name='Текст перед заголовком')),
('pre_title_en', models.CharField(blank=True, max_length=250, null=True, verbose_name='Текст перед заголовком')),
('but1_title', models.CharField(blank=True, max_length=100, null=True, verbose_name='Текст на кнопке 1')),
('but1_title_ru', models.CharField(blank=True, max_length=100, null=True, verbose_name='Текст на кнопке 1')),
('but1_title_en', models.CharField(blank=True, max_length=100, null=True, verbose_name='Текст на кнопке 1')),
('but2_title', models.CharField(blank=True, max_length=100, null=True, verbose_name='Текст на кнопке 2')),
('but2_title_ru', models.CharField(blank=True, max_length=100, null=True, verbose_name='Текст на кнопке 2')),
('but2_title_en', models.CharField(blank=True, max_length=100, null=True, verbose_name='Текст на кнопке 2')),
('but1_url', models.TextField(blank=True, null=True, verbose_name='URL привязанной страницы к кнопке 1')),
('but2_url', models.TextField(blank=True, null=True, verbose_name='URL привязанной страницы к кнопке 2')),
('content_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='contenttypes.contenttype')),
],
options={
'verbose_name': 'Блок презентации плагина',
'verbose_name_plural': 'Блоки презентации плагина',
},
),
]

29
ServicesApp/migrations/0004_alter_blockpluginpresentation_picture_and_more.py Normal file
View File

@@ -0,0 +1,29 @@
# 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 = [
('ServicesApp', '0003_blockpluginpresentation'),
]
operations = [
migrations.AlterField(
model_name='blockpluginpresentation',
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='section',
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='service',
name='picture',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Картинка'),
),
]

24
ServicesApp/migrations/0005_blockpluginpresentation_but1_icon_and_more.py Normal file
View File

@@ -0,0 +1,24 @@
# 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 = [
('ServicesApp', '0004_alter_blockpluginpresentation_picture_and_more'),
]
operations = [
migrations.AddField(
model_name='blockpluginpresentation',
name='but1_icon',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Пиктограмма для кнопки 1'),
),
migrations.AddField(
model_name='blockpluginpresentation',
name='but2_icon',
field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Пиктограмма для кнопки 2'),
),
]

43
ServicesApp/models.py
View File

@@ -1,8 +1,48 @@
from django.db import models
from BaseModels.base_models import *
from django.utils.translation import gettext_lazy as _
from GeneralApp.models import Block_Abstract
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.fields import GenericRelation
from django.core.validators import validate_image_file_extension
class BlockPluginPresentation(Block_Abstract):
from BaseModels.base_models import Manager_Enabled
objects = models.Manager()
enabled_objs = Manager_Enabled()
content_type = models.ForeignKey(ContentType, on_delete=models.SET_NULL, null=True)
object_id = models.PositiveIntegerField()
content_object = GenericForeignKey('content_type', 'object_id')
pre_title = models.CharField(max_length=250, verbose_name=_('Текст перед заголовком'), null=True, blank=True)
but1_title = models.CharField(max_length=100, verbose_name=_('Текст на кнопке 1'), null=True, blank=True)
but2_title = models.CharField(max_length=100, verbose_name=_('Текст на кнопке 2'), null=True, blank=True)
but1_url = models.TextField(verbose_name=_('URL привязанной страницы к кнопке 1'), null=True, blank=True)
but2_url = models.TextField(verbose_name=_('URL привязанной страницы к кнопке 2'), null=True, blank=True)
but1_icon = models.FileField(
upload_to='uploads/', verbose_name=_('Пиктограмма для кнопки 1'), null=True, blank=True,
validators=[validate_file_extension]
)
but2_icon = models.FileField(
upload_to='uploads/', verbose_name=_('Пиктограмма для кнопки 2'), null=True, blank=True,
validators=[validate_file_extension]
)
class Meta:
verbose_name = _('Блок презентации плагина')
verbose_name_plural = _('Блоки презентации плагина')
class Section(BaseModelViewPage):
plugin_presentation = GenericRelation('ServicesApp.BlockPluginPresentation',
related_query_name='grel_%(class)s_for_block_plugin_presentation')
class Meta:
verbose_name = _('Раздел сайта')
verbose_name_plural = _('Разделы сайта')
@@ -22,6 +62,9 @@ class Service(BaseModelViewPage):
on_delete=models.SET_NULL, related_name='rel_children_for_service',
null=True, blank=True
)
class Meta:
verbose_name = _('Услуга')
verbose_name_plural = _('Услуги')

7
ServicesApp/translation.py
View File

@@ -2,6 +2,13 @@ from modeltranslation.translator import translator, TranslationOptions
from .models import *
class BlockPluginPresentation_TranslationOptions(TranslationOptions):
fields = (
'name', 'description', 'text', 'title', 'pre_title', 'but1_title', 'but2_title'
)
translator.register(BlockPluginPresentation, BlockPluginPresentation_TranslationOptions)
class Section_TranslationOptions(TranslationOptions):
fields = (
'name', 'description', 'text', 'title', 'FAQ_title', 'seo_title', 'seo_description', 'seo_text'