From 2bf36924744fd4c0f1b6f8fa71b32a030cf80873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=9D=D0=B0=D0=B4=D0=B5?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Tue, 2 Dec 2025 11:11:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=20LdapSyncState:=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20model+object=5Fpk=20=D0=B2=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=20=D0=BD=D0=B5=D1=81=D1=83=D1=89=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B5=D0=B3=D0=BE=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8F=20employee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/api/v1/employees/views.py | 12 ++++++++++-- backend/static/js/components/employeeFormHandler.js | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/backend/api/v1/employees/views.py b/backend/api/v1/employees/views.py index 6ca44fe0..81381d73 100644 --- a/backend/api/v1/employees/views.py +++ b/backend/api/v1/employees/views.py @@ -1787,7 +1787,11 @@ class EmployeeViewSet(viewsets.ModelViewSet): if ldap_enabled: from employees.models import LdapSyncState has_ldap_dn = ( - LdapSyncState.objects.filter(employee=instance, ldap_dn__isnull=False).exists() + LdapSyncState.objects.filter( + model='employee', + object_pk=str(instance.pk), + ldap_dn__isnull=False + ).exists() or (hasattr(instance, 'ldap_dn') and instance.ldap_dn) ) logger.info(f"[ME PATCH] Step 9.5: LDAP enabled, user has ldap_dn: {has_ldap_dn}") @@ -2069,7 +2073,11 @@ class EmployeeViewSet(viewsets.ModelViewSet): if ldap_enabled: from employees.models import LdapSyncState has_ldap_dn = ( - LdapSyncState.objects.filter(employee=emp, ldap_dn__isnull=False).exists() + LdapSyncState.objects.filter( + model='employee', + object_pk=str(emp.pk), + ldap_dn__isnull=False + ).exists() or (hasattr(emp, 'ldap_dn') and emp.ldap_dn) ) print(f"[EMP PATCH] LDAP enabled, user has ldap_dn: {has_ldap_dn}") diff --git a/backend/static/js/components/employeeFormHandler.js b/backend/static/js/components/employeeFormHandler.js index 65387ced..e8dd3337 100644 --- a/backend/static/js/components/employeeFormHandler.js +++ b/backend/static/js/components/employeeFormHandler.js @@ -56,6 +56,10 @@ export function initEmployeeForm(options = {}) { }, 1000); } else { console.warn('[EmployeeForm] Ошибка валидации:', data); + // Логируем полный текст ошибки detail для отладки + if (data.detail) { + console.error('[EmployeeForm] Полный текст ошибки detail:', data.detail); + } displayFormErrors(form, data); showErrorMessage('Исправьте ошибки в форме'); }