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

0.0.4

Browse Source 
AuthApp add
This commit is contained in:
SDE
2023-06-21 13:48:00 +03:00
parent e8c653ac30
commit 0f2ac168d6
21 changed files with 877 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
GeneralApp/admin.py
View File

@@ -2,24 +2,23 @@ from sets.admin import *
from .models import *
from django.contrib import admin
class Admin_StaticPage(Admin_BaseModelViewPage):
class Admin_StaticPage(Admin_Trans_BaseModelViewPage):
def get_fieldsets(self, request, obj=None):
fieldsets = super(type(self), self).get_fieldsets(request, obj)
if not request.user.is_superuser and obj.url and obj.url in ('main', 'spec_technics', 'works'):
fieldsets[0][1]['fields'].pop(2)
fieldsets.insert(
1, ('Промо-хэдер', {
'classes': ['wide'],
'fields': (
'promo_header',
'title', 'description', 'text',
'picture',
)
})
)
# fieldsets.insert(
# 1, ('Промо-хэдер', {
# 'classes': ['wide'],
# 'fields': (
# 'promo_header',
# 'title', 'description', 'text',
# 'picture',
# )
#
# })
# )
return fieldsets
def has_delete_permission(self, request, obj=None):

144
GeneralApp/migrations/0002_block_faq_title_en_block_faq_title_ru_and_more.py Normal file
View File

@@ -0,0 +1,144 @@
# Generated by Django 4.2.2 on 2023-06-20 15:48
import ckeditor.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('GeneralApp', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='block',
name='FAQ_title_en',
field=models.CharField(blank=True, max_length=250, null=True, verbose_name='FAQ Заголовок'),
),
migrations.AddField(
model_name='block',
name='FAQ_title_ru',
field=models.CharField(blank=True, max_length=250, null=True, verbose_name='FAQ Заголовок'),
),
migrations.AddField(
model_name='block',
name='description_en',
field=ckeditor.fields.RichTextField(blank=True, help_text='краткое описание страницы (до 240 символов)', null=True, verbose_name='Краткое описание'),
),
migrations.AddField(
model_name='block',
name='description_ru',
field=ckeditor.fields.RichTextField(blank=True, help_text='краткое описание страницы (до 240 символов)', null=True, verbose_name='Краткое описание'),
),
migrations.AddField(
model_name='block',
name='name_en',
field=models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название'),
),
migrations.AddField(
model_name='block',
name='name_ru',
field=models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название'),
),
migrations.AddField(
model_name='block',
name='text_en',
field=ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='Полное описание'),
),
migrations.AddField(
model_name='block',
name='text_ru',
field=ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='Полное описание'),
),
migrations.AddField(
model_name='block',
name='title_en',
field=models.TextField(blank=True, null=True, verbose_name='Заголовок'),
),
migrations.AddField(
model_name='block',
name='title_ru',
field=models.TextField(blank=True, null=True, verbose_name='Заголовок'),
),
migrations.AddField(
model_name='faqitem',
name='answer_en',
field=ckeditor.fields.RichTextField(null=True, verbose_name='Ответ'),
),
migrations.AddField(
model_name='faqitem',
name='answer_ru',
field=ckeditor.fields.RichTextField(null=True, verbose_name='Ответ'),
),
migrations.AddField(
model_name='faqitem',
name='name_en',
field=models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название'),
),
migrations.AddField(
model_name='faqitem',
name='name_ru',
field=models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название'),
),
migrations.AddField(
model_name='faqitem',
name='question_en',
field=models.TextField(null=True, verbose_name='Вопрос'),
),
migrations.AddField(
model_name='faqitem',
name='question_ru',
field=models.TextField(null=True, verbose_name='Вопрос'),
),
migrations.AddField(
model_name='staticpage',
name='FAQ_title_en',
field=models.CharField(blank=True, max_length=250, null=True, verbose_name='FAQ Заголовок'),
),
migrations.AddField(
model_name='staticpage',
name='FAQ_title_ru',
field=models.CharField(blank=True, max_length=250, null=True, verbose_name='FAQ Заголовок'),
),
migrations.AddField(
model_name='staticpage',
name='description_en',
field=ckeditor.fields.RichTextField(blank=True, help_text='краткое описание страницы (до 240 символов)', null=True, verbose_name='Краткое описание'),
),
migrations.AddField(
model_name='staticpage',
name='description_ru',
field=ckeditor.fields.RichTextField(blank=True, help_text='краткое описание страницы (до 240 символов)', null=True, verbose_name='Краткое описание'),
),
migrations.AddField(
model_name='staticpage',
name='name_en',
field=models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название'),
),
migrations.AddField(
model_name='staticpage',
name='name_ru',
field=models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название'),
),
migrations.AddField(
model_name='staticpage',
name='text_en',
field=ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='Полное описание'),
),
migrations.AddField(
model_name='staticpage',
name='text_ru',
field=ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='Полное описание'),
),
migrations.AddField(
model_name='staticpage',
name='title_en',
field=models.TextField(blank=True, null=True, verbose_name='Заголовок'),
),
migrations.AddField(
model_name='staticpage',
name='title_ru',
field=models.TextField(blank=True, null=True, verbose_name='Заголовок'),
),
]

5
GeneralApp/models.py
View File

@@ -39,7 +39,10 @@ class FAQitem(BaseModel):
answer = RichTextField(verbose_name='Ответ')
def __str__(self):
return self.question
if self.question:
return self.question
else:
return self.id
class Meta:
verbose_name = 'FAQ'

23
GeneralApp/translation.py Normal file
View File

@@ -0,0 +1,23 @@
from modeltranslation.translator import translator, TranslationOptions
from .models import *
class StaticPage_TranslationOptions(TranslationOptions):
fields = (
'name', 'description', 'text', 'title', 'FAQ_title'
)
translator.register(StaticPage, StaticPage_TranslationOptions)
class Block_TranslationOptions(TranslationOptions):
fields = (
'name', 'description', 'text', 'title', 'FAQ_title'
)
translator.register(Block, Block_TranslationOptions)
class FAQitem_TranslationOptions(TranslationOptions):
fields = (
'name', 'question', 'answer'
)
translator.register(FAQitem, FAQitem_TranslationOptions)