Robotail/Corp
Robotail/Corp
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлена ошибка фильтра LdapSyncState: использование model+object_pk вместо несуществующего поля employee

Browse Source
This commit is contained in:
admin i 2025-12-02 11:11:50 +03:00
parent 5aa8149514
commit 2bf3692474
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/api/v1/employees/views.py
View File

@ -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}")

4
backend/static/js/components/employeeFormHandler.js
View File

@ -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('Исправьте ошибки в форме');
}