educommon 3.21.0__py3-none-any.whl → 3.22.1__py3-none-any.whl

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/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/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/objectpack/ui.py

@@ -47,7 +47,7 @@ class GridPanel(ext.ExtPanel):
         self.template = t
 
     @staticmethod
-    def _create_grid(pack, columns, grid_cls, group_by=None, **kwargs):
+    def _create_grid(pack, columns, grid_cls, group_by=None, force_fit=False, **kwargs):
         """Метод возвращает грид.
 
         :param grid_cls: класс грида
@@ -55,7 +55,7 @@ class GridPanel(ext.ExtPanel):
         :param str group_by: темплейт для группирования
         """
         grid = grid_cls(
-            region='north', force_fit=False, auto_scroll=True, auto_width=False, cls='word-wrap-grid', **kwargs
+            region='north', force_fit=force_fit, auto_scroll=True, auto_width=False, cls='word-wrap-grid', **kwargs
         )
         grid.flex = 1
         grid.sm = ext.ExtGridCellSelModel()

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/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.21.0.dist-info → educommon-3.22.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: educommon
-Version: 3.21.0
+Version: 3.22.1
 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.21.0.dist-info → educommon-3.22.1.dist-info}/RECORD

@@ -84,7 +84,7 @@ educommon/auth/rbac/app_meta.py,sha256=IprrnLlW5tYVew3h0RhIqByQmvsd6huZAdEcrvYbB
 educommon/auth/rbac/checker.py,sha256=1Iu3RNzf2VGWV-7DSPXQnECQxJjNOu-vq79eQ52uHwo,2927
 educommon/auth/rbac/config.py,sha256=mRpOzD29ZHc0zX-CxhUyyICj3h0xj9gUM6N1OoLEWm0,1074
 educommon/auth/rbac/constants.py,sha256=Hm4kuG7HZ9krTwF6HIj3eMe8v98ui3EMueToBTeOh4A,502
-educommon/auth/rbac/manager.py,sha256=aHPCO9EIzLVIj81kH9mMXmALhGXaEYX7j0sjWb-t8EU,15727
+educommon/auth/rbac/manager.py,sha256=PntYREOVL17IfB38VwRCt1ufiXtiLNxLA_RL5A4oA0g,15700
 educommon/auth/rbac/models.py,sha256=Gg4o0gyuUuPsaQMvgnvgmxx1-iccye0d5Hk1CbQfYQA,16198
 educommon/auth/rbac/permissions.py,sha256=S3P-q6wFI_ZDawYgfgFg3gcMk68Pvm-X3wnzERgmc_M,868
 educommon/auth/rbac/ui.py,sha256=RuPPJAhOird0idLEtd4ybSJxEIGMXuqcPpBOzh9NMTI,16298
@@ -107,7 +107,7 @@ educommon/auth/rbac/templates/rbac/role-edit-window.js,sha256=5MueeeqykEdsW6BceI
 educommon/auth/rbac/templates/rbac/roles-list-window.js,sha256=q7QqjsRyFtr1qk0dOJ9zn708SzCR9t_uN03ureIcqNQ,3768
 educommon/auth/rbac/templates/rbac/roles-view-list-window.js,sha256=gRkVvd-Wak57q9mNgDSXzzy-Pv-ZQokwQIlmhlFLys0,536
 educommon/auth/simple_auth/__init__.py,sha256=GvXC6lP94ADiTg5k9JmDI1FkG8tlJxBum5e4_6zbJHI,237
-educommon/auth/simple_auth/actions.py,sha256=09AMooNi-m8y5nUJPGXCYjxmxBnbjqAKeqq0W8gpq-U,13110
+educommon/auth/simple_auth/actions.py,sha256=Hl_tYZ55Z3GRx8lp9fvjS53OycmPK0pgm1W183kOCsY,13193
 educommon/auth/simple_auth/app_meta.py,sha256=RAj9kQt30gje_qqF0ZwoOcqqGjXjYInJiw50xwfekT8,1017
 educommon/auth/simple_auth/checkers.py,sha256=cFGjmCc_YkXaK0m7rMjlnUid8VnyGKRtM7vELc3eFvA,2496
 educommon/auth/simple_auth/const.py,sha256=vizOnXnOVzY5CkgilnwBmhc3vO4biYKUu4VnzM7XsL4,396
@@ -224,14 +224,14 @@ educommon/m3/extensions/listeners/delete_check/cancel-confirm-window.js,sha256=X
 educommon/m3/extensions/listeners/delete_check/listeners.py,sha256=Vc-y0E3OaNI4MYhPY65hUo2p5m2qpp63F2H7mQABLeE,6340
 educommon/m3/extensions/listeners/delete_check/mixins.py,sha256=OZCHFUqq6YI7V7-9NNp72kA40jxq3X9sp-89UN0gnSU,7938
 educommon/m3/extensions/listeners/delete_check/related-objects-window.html,sha256=Do_SnmWfexnhDzgvr7o7JJubH4N8pvPNa268cd-JIcA,94
-educommon/m3/extensions/listeners/delete_check/signals.py,sha256=fIfK2wPDUcgLYicE9cTo3JK0p0WaX9DGqednAJzC-tg,467
+educommon/m3/extensions/listeners/delete_check/signals.py,sha256=JEPj9sbuCqIxLeRmc6kB81omyhvOCmFKAHUimNMU__Q,387
 educommon/m3/extensions/listeners/delete_check/ui.py,sha256=3omrRxPt2PRL4rjzjXQQITwZYoR9xnmnvcyJYJn54Pk,3376
 educommon/m3/extensions/listeners/delete_check/utils.py,sha256=RD7agHge_O-bxgpi1D7rke7PY6PAYodDTY19OIT6Zzc,3028
 educommon/objectpack/__init__.py,sha256=TwmrbrumJoH9KjYhbLnKExWmo4A0UQeyNYTK__93Vr8,69
 educommon/objectpack/actions.py,sha256=cMPI9wyNVPvpTl_x4MtJ9XnJ5VhhL4vnuh6ORsQV5oQ,14233
 educommon/objectpack/apps.py,sha256=6Gk1Uqt_TOyLoCJ9tu-HCWy_BcDoSMhFOPpVBxnp98w,491
 educommon/objectpack/filters.py,sha256=zBDhnXTQ31oQMcUKhOkiTBXkm5Appg755KNrEFwD3no,5020
-educommon/objectpack/ui.py,sha256=qqzgKPFWVY9oJ86oJBXj3ToTw8o8LrBoVwkgrpz9pbA,14087
+educommon/objectpack/ui.py,sha256=a5GowO16azq9mNhigbDxRdgN4o5gFb9jkX--7s_5Nmw,14108
 educommon/objectpack/templates/base-grid-window.js,sha256=kq49GGDGPScqLCouIy0-seOimt5eX_l2pAkQNJ0rNCw,437
 educommon/objectpack/templates/filter-panel.js,sha256=vYw_AxOMRk0ylSBUT46qphilxKkKpaXzT5HfGwwoLYo,1408
 educommon/objectpack/templates/grid-panel.js,sha256=o6qkZ9o1MbFJd0LGq3HIk_5YIwC4WHfQT5NNEYEGo2o,1544
@@ -251,7 +251,7 @@ educommon/report/constructor/config.py,sha256=2kWlilm6LGXAbrVHnLbzhwp1pTBAz_eOf_
 educommon/report/constructor/constants.py,sha256=VF3tu6vEWrN37oPyipD3LGCElbaY2JHGaKy7AxUbQIU,3381
 educommon/report/constructor/exceptions.py,sha256=4k2fHrMr-U74kjjE8hXDtG-MRaZBGqNir7-KPf4h_AY,1153
 educommon/report/constructor/mixins.py,sha256=dMwBJJbkE4YeBSi49EMrNlDan4Mkqatbif8n11XcpqU,2788
-educommon/report/constructor/models.py,sha256=Jq6Am19VUEabnImAT53VtuUkiwvZgVvWIv3GTS-aus0,17913
+educommon/report/constructor/models.py,sha256=iE_Dqeu4blLwzyZje-oJPUEC2ikyfCPrtNcgkCkk5-s,17904
 educommon/report/constructor/plugin_meta.py,sha256=52IdIKr7ArMiHOnyZlKV5Fn6PxMhSbttipXz_Vbfkmg,114
 educommon/report/constructor/registries.py,sha256=aTFeW0htAeDYWd9HlLqn3GTK3mttjS8I8LddPc6Ea7M,1883
 educommon/report/constructor/utils.py,sha256=kjiYBfC0-DmDk5kYOOevmc7SUcytljyemb1uy4qa4hA,6494
@@ -278,6 +278,7 @@ educommon/report/constructor/migrations/0007_include_available_units.py,sha256=e
 educommon/report/constructor/migrations/0008_auto_20170407_1318.py,sha256=jXGQZHKlJgc7LMTIPo7EV5Keh86_rm-52sSqwN8pYyU,555
 educommon/report/constructor/migrations/0009_auto_20180405_0642.py,sha256=Skf1q8ONvLR_keNh4qZ5RRsORjFdyCDZJO4NbaGWl8U,485
 educommon/report/constructor/migrations/0010_add_aggregate_fields.py,sha256=DyY52puOKq9rDABEHLwgylTxWSS1hE6zgaTp5GiMqaY,922
+educommon/report/constructor/migrations/0011_alter_reportfilter_case_sensitive_and_more.py,sha256=kCwjtYLwZD-rktHY2oYBZZHyv--Ng4rBgdOSQuuJOMw,977
 educommon/report/constructor/migrations/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 educommon/rest/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 educommon/rest/actions.py,sha256=LpFtNDuxIDQ2GG6hBqkLrINrW087tLjlfyUHv85AUGA,1255
@@ -355,7 +356,7 @@ educommon/ws_log/smev/exceptions.py,sha256=VNfzNHlj5Pz8D4979d_msTkxC-RQVoMctsgoJ
 educommon/ws_log/templates/report/smev_logs.xlsx,sha256=nnYgB0Z_ix8HoxsRICjsZfFRQBdra-5Gd8nWhCxTjYg,10439
 educommon/ws_log/templates/ui-js/smev-logs-list-window.js,sha256=AGup3D8GTJSY9WdDPj0zBJeYQBFOmGgcbxPOJbKK-nY,513
 educommon/ws_log/templates/ui-js/smev-logs-report-setting-window.js,sha256=nQ7QYK9frJcE7g7kIt6INg9TlEEJAPPayBJgRaoTePA,1103
-educommon-3.21.0.dist-info/METADATA,sha256=ymYMv5xu-FGq3UhMGK7cQPy76COkIvxrvH7_bJH5yZ4,2380
-educommon-3.21.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-educommon-3.21.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.21.0.dist-info/RECORD,,
+educommon-3.22.1.dist-info/METADATA,sha256=2bRUq7Re91XlsIu8o5ZCfCfyUUPwDVpySTPz9fyh-4I,2421
+educommon-3.22.1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+educommon-3.22.1.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.22.1.dist-info/RECORD,,