diff --git a/BaseModels/base_models.py b/BaseModels/base_models.py index a727514..1940d78 100644 --- a/BaseModels/base_models.py +++ b/BaseModels/base_models.py @@ -148,6 +148,11 @@ class BaseModelViewPage(BaseModel): class Meta: abstract = True + def save(self, not_change_modifiedDT=False, *args, **kwargs): + if not not_change_modifiedDT: + self.modifiedDT = datetime.now() + super().save(*args, **kwargs) + def get_title(self): if self.seo_title: return self.seo_title diff --git a/DocsApp/models.py b/DocsApp/models.py index 8463088..2ce6211 100644 --- a/DocsApp/models.py +++ b/DocsApp/models.py @@ -2,7 +2,7 @@ from django.db import models from BaseModels.base_models import BaseModelViewPage, BaseModel from ckeditor_uploader.fields import RichTextUploadingField from django.utils.translation import gettext_lazy as _ - +from datetime import datetime class DocVersion(BaseModel): url = models.TextField( @@ -43,6 +43,11 @@ class DocArt(BaseModelViewPage): related_name='rel_docArts_for_version' ) + # def save(self, not_change_modifiedDT=False, *args, **kwargs): + # if not not_change_modifiedDT: + # self.modifiedDT = datetime.now() + # super().save(*args, **kwargs) + def get_last_child(self): return self.rel_childArts_for_docArt.filter(enable=True).order_by('-order').first() diff --git a/GeneralApp/migrations/0026_fileunit_alter_office_work_time_from_and_more.py b/GeneralApp/migrations/0026_fileunit_alter_office_work_time_from_and_more.py new file mode 100644 index 0000000..72339b4 --- /dev/null +++ b/GeneralApp/migrations/0026_fileunit_alter_office_work_time_from_and_more.py @@ -0,0 +1,66 @@ +# Generated by Django 4.2.7 on 2024-07-14 13:22 + +import datetime +from django.db import migrations, models +import filebrowser.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0025_alter_office_work_time_from_and_more'), + ] + + operations = [ + migrations.CreateModel( + name='FileUnit', + 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='Дополнительные данные')), + ('file', filebrowser.fields.FileBrowseField(max_length=250, verbose_name='Файл')), + ('file_ru', filebrowser.fields.FileBrowseField(max_length=250, null=True, verbose_name='Файл')), + ('file_en', filebrowser.fields.FileBrowseField(max_length=250, null=True, verbose_name='Файл')), + ], + options={ + 'abstract': False, + }, + ), + migrations.AlterField( + model_name='office', + name='work_time_from', + field=models.TimeField(default=datetime.datetime(2024, 7, 14, 9, 0), verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from_en', + field=models.TimeField(default=datetime.datetime(2024, 7, 14, 9, 0), null=True, verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from_ru', + field=models.TimeField(default=datetime.datetime(2024, 7, 14, 9, 0), null=True, verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to', + field=models.TimeField(default=datetime.datetime(2024, 7, 14, 18, 0), verbose_name='Время работы до'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to_en', + field=models.TimeField(default=datetime.datetime(2024, 7, 14, 18, 0), null=True, verbose_name='Время работы до'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to_ru', + field=models.TimeField(default=datetime.datetime(2024, 7, 14, 18, 0), null=True, verbose_name='Время работы до'), + ), + ]