educommon 3.20.0__tar.gz → 3.22.0__tar.gz

{educommon-3.20.0 → educommon-3.22.0}/CHANGELOG.md

@@ -28,6 +28,27 @@
 ### Удалено
 
 
+
+## [3.22.0] - 2025-07-17
+
+Добавлена поддержка django 4.0
+
+### Добавлено
+
+- [EDUKNDG-14483](https://jira.bars.group/browse/EDUKNDG-14483)
+  MINOR Поднять версию Django до 4.0.10
+
+
+# [3.21.0] - 2025-07-04
+
+Добавлено поле id в дата-класс BaseEntity
+
+### Добавлено
+
+- [EDUSCHL-23347](https://jira.bars.group/browse/EDUSCHL-23347)
+ MINOR Добавлено поле id в дата-класс BaseEntity
+
+
 # [3.20.0] - 2025-06-23
 
 Добавлена manage-команда удаления ложных логов в таблицах audit_log_auditlog и state_log_all.

{educommon-3.20.0 → educommon-3.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: educommon
-Version: 3.20.0
+Version: 3.22.0
 Summary: Общая кодовая база для проектов БЦ Образование
 Author-email: BARS Group <education_dev@bars-open.ru>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/educommon/browse
@@ -17,10 +17,11 @@ Classifier: Framework :: Django :: 2.2
 Classifier: Framework :: Django :: 3.0
 Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.0
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: packaging<25,>=21
-Requires-Dist: Django<4,>=3.1
+Requires-Dist: Django<5.0,>=3.1
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor

{educommon-3.20.0 → educommon-3.22.0}/pyproject.toml

@@ -17,7 +17,7 @@ readme = 'README.md'
 requires-python = '>=3.9'
 dependencies = [
     'packaging>=21,<25',
-    'Django>=3.1,<4',
+    'Django>=3.1,<5.0',
     'django-mptt',
     'python-dateutil',
     'termcolor',
@@ -51,6 +51,7 @@ classifiers = [
     'Framework :: Django :: 3.0',
     'Framework :: Django :: 3.1',
     'Framework :: Django :: 3.2',
+    'Framework :: Django :: 4.0',
 ]
 dynamic = ['version']
 

{educommon-3.20.0 → educommon-3.22.0}/src/educommon/auth/rbac/manager.py

@@ -24,10 +24,6 @@ from django.utils.functional import (
 from m3.actions import (
     ControllerCache,
 )
-from m3_django_compat import (
-    atomic,
-    get_installed_apps,
-)
 
 from educommon.auth.rbac.models import (
     Permission,
@@ -35,6 +31,10 @@ from educommon.auth.rbac.models import (
 from educommon.utils.db.postgresql import (
     Lock,
 )
+from m3_django_compat import (
+    atomic,
+    get_installed_apps,
+)
 
 
 def _get_handler(handler):
@@ -104,7 +104,7 @@ def _set_permission(permission, name, title, description, hidden):
 class RBACManager:
     """Менеджер системы авторизации RBAC."""
 
-    post_init = Signal(providing_args=('changed',))
+    post_init = Signal()
     """Сигнал, отправляемый после обновления разрешений в БД.
 
     :param bool changed: Указывает, были ли в процессе инициализации подсистемы

{educommon-3.20.0 → educommon-3.22.0}/src/educommon/auth/simple_auth/actions.py

@@ -37,18 +37,10 @@ from m3.actions.results import (
     OperationResult,
     PreJsonResult,
 )
-from m3_django_compat import (
-    get_user_model,
-)
 from m3_ext.ui.shortcuts import (
     MessageBox,
 )
 
-from objectpack.actions import (
-    BaseAction,
-    BasePack,
-)
-
 from educommon import (
     ioc,
 )
@@ -63,6 +55,13 @@ from educommon.auth.simple_auth.models import (
 from educommon.m3 import (
     convert_validation_error_to,
 )
+from m3_django_compat import (
+    get_user_model,
+)
+from objectpack.actions import (
+    BaseAction,
+    BasePack,
+)
 
 
 class AuthPack(BasePack):
@@ -174,7 +173,7 @@ class LoginAction(BaseAction):
 
         err_msg = self.parent.login_checker.check(request, username, password)
 
-        if not request.is_ajax():
+        if not request.headers.get('x-requested-with') == 'XMLHttpRequest':
             result = HttpResponseRedirect('/')
         elif err_msg:
             result = PreJsonResult(
@@ -378,7 +377,7 @@ class LogoutAction(BaseAction):
     def run(self, request, context):
         auth.logout(request)
 
-        if request.is_ajax():
+        if request.headers.get('x-requested-with') == 'XMLHttpRequest':
             return PreJsonResult({})
         else:
             return http.HttpResponseRedirect('/')

{educommon-3.20.0 → educommon-3.22.0}/src/educommon/integration_entities/entities.py

@@ -20,6 +20,8 @@ class BaseEntity:
 
     # Проводимая операция с записью сущности
     operation: int
+    # Id выгружаемой модели
+    id: str
 
     @classmethod
     @abstractmethod

{educommon-3.20.0 → educommon-3.22.0}/src/educommon/m3/extensions/listeners/delete_check/signals.py

@@ -6,5 +6,5 @@ from django.db.models.signals import (
 # Сигналы перед и после каскадного удаления объекта (CascadeDeleteMixin)
 #   - instance - удаляемый объект
 #   - initiator - объект, который стал инициатором удаления instance
-pre_cascade = ModelSignal(providing_args=['instance', 'initiator'])
-post_cascade = ModelSignal(providing_args=['instance', 'initiator'])
+pre_cascade = ModelSignal()
+post_cascade = ModelSignal()

educommon-3.22.0/src/educommon/report/constructor/migrations/0011_alter_reportfilter_case_sensitive_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.0.10 on 2025-07-08 14:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_constructor', '0010_add_aggregate_fields'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reportfilter',
+            name='case_sensitive',
+            field=models.BooleanField(null=True, verbose_name='Учет регистра'),
+        ),
+        migrations.AlterField(
+            model_name='reportfiltergroup',
+            name='level',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='reportfiltergroup',
+            name='lft',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='reportfiltergroup',
+            name='rght',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+    ]

{educommon-3.20.0 → educommon-3.22.0}/src/educommon/report/constructor/models.py

@@ -9,10 +9,6 @@ from mptt.models import (
     TreeForeignKey,
 )
 
-from objectpack.exceptions import (
-    ValidationError,
-)
-
 from educommon.django.db.mixins.validation import (
     post_clean,
 )
@@ -34,6 +30,9 @@ from educommon.report.constructor.validators import (
 from educommon.utils.misc import (
     cached_property,
 )
+from objectpack.exceptions import (
+    ValidationError,
+)
 
 
 class ReportTemplate(CascadeDeleteMixin, BaseModel):
@@ -331,9 +330,7 @@ class ReportFilter(BaseModel):
         'Исключать записи, удовлетворяющие условию',
         default=False,
     )
-    case_sensitive = models.NullBooleanField(
-        'Учет регистра',
-    )
+    case_sensitive = models.BooleanField('Учет регистра', null=True)
     values = ArrayField(
         models.TextField(
             'Значение',

{educommon-3.20.0 → educommon-3.22.0}/src/educommon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: educommon
-Version: 3.20.0
+Version: 3.22.0
 Summary: Общая кодовая база для проектов БЦ Образование
 Author-email: BARS Group <education_dev@bars-open.ru>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/educommon/browse
@@ -17,10 +17,11 @@ Classifier: Framework :: Django :: 2.2
 Classifier: Framework :: Django :: 3.0
 Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.0
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: packaging<25,>=21
-Requires-Dist: Django<4,>=3.1
+Requires-Dist: Django<5.0,>=3.1
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor

{educommon-3.20.0 → educommon-3.22.0}/src/educommon.egg-info/SOURCES.txt

@@ -289,6 +289,7 @@ src/educommon/report/constructor/migrations/0007_include_available_units.py
 src/educommon/report/constructor/migrations/0008_auto_20170407_1318.py
 src/educommon/report/constructor/migrations/0009_auto_20180405_0642.py
 src/educommon/report/constructor/migrations/0010_add_aggregate_fields.py
+src/educommon/report/constructor/migrations/0011_alter_reportfilter_case_sensitive_and_more.py
 src/educommon/report/constructor/migrations/__init__.py
 src/educommon/rest/__init__.py
 src/educommon/rest/actions.py

{educommon-3.20.0 → educommon-3.22.0}/src/educommon.egg-info/requires.txt

@@ -1,5 +1,5 @@
 packaging<25,>=21
-Django<4,>=3.1
+Django<5.0,>=3.1
 django-mptt
 python-dateutil
 termcolor