From 7fd191d8efdb13472991571fb879dfe1c98f2906 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: Fri, 5 Dec 2025 13:13:43 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20AJAX=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B4=D0=BE=D0=BA=D1=83?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Добавлен импорт initDocumentListHandler в documentList.js - Инициализация documentListHandler с правильными параметрами - Считывание scope и ack_status из URL параметров - Добавление scope в API запрос - Передача userId и canManage через data-атрибуты - Автоматическое применение scope при инициализации --- .../js/components/documentListHandler.js | 18 ++++++++--- backend/static/js/pages/documentList.js | 30 +++++++++++++++++-- .../templates/documents/document_list.html | 5 ++++ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/backend/static/js/components/documentListHandler.js b/backend/static/js/components/documentListHandler.js index c575c63a..24477a90 100644 --- a/backend/static/js/components/documentListHandler.js +++ b/backend/static/js/components/documentListHandler.js @@ -31,14 +31,17 @@ export function initDocumentListHandler(options) { } // Текущее состояние - let currentScope = 'mine'; // 'mine' | 'all' - let currentAckStatus = ''; // '' | 'acked' | 'not_acked' + const urlParams = new URLSearchParams(window.location.search); + let currentScope = urlParams.get('scope') || 'mine'; // 'mine' | 'all' + let currentAckStatus = urlParams.get('ack_status') || ''; // '' | 'acked' | 'not_acked' let allDocuments = []; // Все загруженные документы let loading = false; let hasMore = true; let nextUrl = null; let totalCount = 0; + console.log('documentListHandler: init with scope =', currentScope, 'ack_status =', currentAckStatus); + // Intersection Observer для бесконечной прокрутки let observerTarget = null; let observer = null; @@ -68,8 +71,15 @@ export function initDocumentListHandler(options) { hideLoadingSpinner(); return []; } else { - url = apiListUrl; - console.log('loadDocuments: initial load', url); + // Формируем URL с параметрами scope + const params = new URLSearchParams(); + if (currentScope === 'mine') { + params.append('scope', 'mine'); + } + // ack_status фильтруется на клиенте, не в API + + url = `${apiListUrl}?${params}`; + console.log('loadDocuments: initial load', url, 'scope:', currentScope); } const response = await fetch(url, { headers }); diff --git a/backend/static/js/pages/documentList.js b/backend/static/js/pages/documentList.js index be3cc127..ca068967 100644 --- a/backend/static/js/pages/documentList.js +++ b/backend/static/js/pages/documentList.js @@ -6,6 +6,7 @@ import { RecipientPicker } from '../components/recipientPickerHandler.js'; import { initDocumentCrud } from '../components/documentCrudHandler.js'; import { initDocumentAcks } from '../components/documentAcksHandler.js'; +import { initDocumentListHandler } from '../components/documentListHandler.js'; /** * Инициализирует страницу списка документов @@ -29,14 +30,39 @@ export function initDocumentListPage(config) { const accessMeta = document.querySelector('meta[name="api-access"]'); const ACCESS = accessMeta ? accessMeta.content : ''; const headers = ACCESS ? { 'Authorization': 'Bearer ' + ACCESS } : {}; + + // Получаем ID текущего пользователя + const userId = parseInt(document.body.dataset.userId || '0', 10); + const canManage = document.body.dataset.canManageDocuments === 'true'; + + // Получаем текущий scope из URL + const urlParams = new URLSearchParams(window.location.search); + const currentScope = urlParams.get('scope') || 'mine'; - console.log('Document CRUD initialization:', { + console.log('Document page initialization:', { apiListUrl, apiDetailBase, employeesApi, departmentsApi, - hasAuth: !!ACCESS + hasAuth: !!ACCESS, + userId, + canManage, + currentScope }); + + // Инициализация списка документов (AJAX загрузка с бесконечной прокруткой) + const documentListHandler = initDocumentListHandler({ + apiListUrl, + acknowledgeUrlTemplate: '/documents/ack/{id}/', + userId, + canManage, + headers + }); + + // Устанавливаем начальный scope + if (currentScope && documentListHandler.setScope) { + documentListHandler.setScope(currentScope); + } // Инициализация RecipientPicker для формы создания const createPicker = new RecipientPicker( diff --git a/backend/templates/documents/document_list.html b/backend/templates/documents/document_list.html index 17d10ba5..1962b6e8 100644 --- a/backend/templates/documents/document_list.html +++ b/backend/templates/documents/document_list.html @@ -212,6 +212,11 @@ {% endblock %} {% block extra_js %} +