diff --git a/app/static/council.js b/app/static/council.js index 06acf4b..f8c18d5 100644 --- a/app/static/council.js +++ b/app/static/council.js @@ -8,8 +8,7 @@ if (names.includes(previous)) branch.value = previous; }); const dialog = document.querySelector('[data-council-dialog]'); - if (!dialog) return; - const form = dialog.querySelector('[data-edit-form]'); + const form = dialog?.querySelector('[data-edit-form]'); const autoSpecialties = form?.querySelector('[data-specialty-auto]'); const specialtyCheckboxes = form ? Array.from(form.querySelectorAll('[name="specialty_codes"]')) : []; autoSpecialties?.addEventListener('change', () => { @@ -149,6 +148,7 @@ }, true); window.addEventListener('resize', repositionTooltips); + if (!dialog) return; dialog.querySelectorAll('[data-edit-close]').forEach(button => { button.addEventListener('click', () => { if (!saving) dialog.close(); }); }); diff --git a/app/templates/council_candidate_articles.html b/app/templates/council_candidate_articles.html index e20699b..458eb3d 100644 --- a/app/templates/council_candidate_articles.html +++ b/app/templates/council_candidate_articles.html @@ -7,9 +7,11 @@ {% if candidate.ambiguous %}

Есть сотрудники с одинаковым ФИО. Публикации из данных ВШЭ не присвоены автоматически; показаны записи из личного кабинета этого сотрудника.

{% endif %}
    {% for article in candidate.articles %} -
  1. +
  2. + {% if can_edit %} {% set employee_id = candidate.employee_id %} {% include "council_edit_button.html" %} + {% endif %}
    {{ article.title }} {{ article.year or 'Год не указан' }}{% set field = 'year' %}{% set label = 'год публикации' %}{% include 'council_warning.html' %} diff --git a/app/templates/council_edit_dialog.html b/app/templates/council_edit_dialog.html index 482b2e3..27989c4 100644 --- a/app/templates/council_edit_dialog.html +++ b/app/templates/council_edit_dialog.html @@ -1,10 +1,10 @@ +{% if can_edit %}

    Редактирование статьи

    - {% if can_edit %}
    {% for name in journal_names|default([]) %} - {% else %} -

    Для редактирования статей и квартилей войдите в систему.

    - Войти в систему - {% endif %}
    +{% endif %} diff --git a/app/templates/council_publications.html b/app/templates/council_publications.html index c89f878..0a42728 100644 --- a/app/templates/council_publications.html +++ b/app/templates/council_publications.html @@ -18,11 +18,10 @@ {% else %}

    Найдено статей: {{ matched }}{% if matched %} · Показаны {{ offset + 1 }}–{{ [offset + limit, matched]|min }}{% endif %}

    - {% if not can_edit %}

    Просмотр доступен без входа. Для сохранения изменений войдите в систему.

    {% endif %}
      {% for article in articles %} -
    1. - {% set employee_id = article.employee_id %}{% include "council_edit_button.html" %} +
    2. + {% if can_edit %}{% set employee_id = article.employee_id %}{% include "council_edit_button.html" %}{% endif %}

      {{ article.employee_name }}

      {{ article.title }}{{ article.year or 'Год не указан' }}{% set field = 'year' %}{% set label = 'год публикации' %}{% include 'council_warning.html' %}

      {{ article.display_type }}{% set field = 'type' %}{% set label = 'тип материала' %}{% include 'council_warning.html' %}

      diff --git a/app/version.py b/app/version.py index 0b5d3a4..da0e8fd 100644 --- a/app/version.py +++ b/app/version.py @@ -1,3 +1,3 @@ -APP_VERSION = "2.0.0" -FRONTEND_VERSION = "2.0.0" -BACKEND_VERSION = "2.0.0" +APP_VERSION = "2.0.1" +FRONTEND_VERSION = "2.0.1" +BACKEND_VERSION = "2.0.1" diff --git a/pyproject.toml b/pyproject.toml index 469db7d..a0e2058 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "miem-workers" -version = "2.0.0" +version = "2.0.1" description = "MIEM employees parser, admin API, and web admin" requires-python = ">=3.11" dependencies = [ diff --git a/tests/browser_council_editor.py b/tests/browser_council_editor.py index 5a84117..a2945ec 100644 --- a/tests/browser_council_editor.py +++ b/tests/browser_council_editor.py @@ -66,16 +66,11 @@ def main(): page.on('pageerror', lambda error: errors.append(str(error))) page.goto('http://miem.test/admin/council') page.locator('.council__candidate-summary').click() + expect(page.locator('.council__article strong')).to_have_text('Исследование передачи данных') + expect(page.locator('[data-council-edit]')).to_have_count(0) + expect(page.locator('[data-council-dialog]')).to_have_count(0) article = page.locator('[data-council-article]') pencil = article.locator('[data-council-edit]') - expect(pencil).to_be_hidden() - article.locator('strong').click() - expect(pencil).to_be_visible() - pencil.click() - expect(page.get_by_role('dialog')).to_be_visible() - expect(page.get_by_role('link', name='Войти в систему', exact=True)).to_be_visible() - page.keyboard.press('Escape') - expect(pencil).to_be_focused() client.cookies.set(SESSION_COOKIE, sign_session('admin', settings)) page.reload() page.locator('.council__candidate-summary').click() diff --git a/tests/test_api.py b/tests/test_api.py index 306992f..781b470 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -18,7 +18,7 @@ def test_health_returns_versions(): response = TestClient(app).get("/api/health") assert response.status_code == 200 - assert response.json()["backend_version"] == "2.0.0" + assert response.json()["backend_version"] == "2.0.1" def test_api_employees_and_stats_require_admin_session(): diff --git a/tests/test_council.py b/tests/test_council.py index 0a3cbb9..40bc10f 100644 --- a/tests/test_council.py +++ b/tests/test_council.py @@ -230,7 +230,7 @@ def test_public_page_data_minimization_and_safe_links(db_session, export): assert "javascript:" not in fragment.text and "private@example.org" not in fragment.text assert "javascript:" not in response.text and "private@example.org" not in response.text assert "/admin/employees/" not in response.text and "/admin/logout" not in response.text - assert "Backend 2.0.0 · Frontend 2.0.0" in response.text + assert "Backend 2.0.1 · Frontend 2.0.1" in response.text assert "Вход в систему" in response.text assert client.get("/admin/directory", follow_redirects=False).status_code in (302, 303, 401, 403) assert "Сотрудники не найдены" in client.get("/admin/council?q=missing").text diff --git a/tests/test_council_editor.py b/tests/test_council_editor.py index 04a38cf..b1c66dd 100644 --- a/tests/test_council_editor.py +++ b/tests/test_council_editor.py @@ -82,8 +82,15 @@ def test_editor_permissions_csrf_validation_and_missing_article(editor, db_sessi assert db_session.get(CouncilCorrections, 1) is None client.cookies.clear() assert save(client, payload).status_code == 401 + original_title = db_session.scalar(select(EmployeePublication.title).where( + EmployeePublication.employee_id == payload['employee_id'])) response = client.get('/admin/council/publications') - assert response.status_code == 200 and 'Для редактирования' in response.text + assert response.status_code == 200 + assert original_title in response.text + assert 'data-council-edit' not in response.text and 'data-council-dialog' not in response.text + fragment = client.get(f"/admin/council/employees/{payload['employee_id']}/articles") + assert fragment.status_code == 200 and original_title in fragment.text + assert 'data-council-article' not in fragment.text and 'data-council-edit' not in fragment.text def test_editor_journal_reassignment_year_scope_and_unknown_year(editor, db_session):