From b23053af7805ee3c30f68cc082c1949585271b8b Mon Sep 17 00:00:00 2001 From: GitInno <86991526+gitnnolabs@users.noreply.github.com> Date: Mon, 1 Jun 2026 13:00:50 -0300 Subject: [PATCH 1/3] [MarkAPI-112] fix: remove tags de conflito. --- markup_doc/wagtail_hooks.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/markup_doc/wagtail_hooks.py b/markup_doc/wagtail_hooks.py index eb070c4..ccf6eef 100644 --- a/markup_doc/wagtail_hooks.py +++ b/markup_doc/wagtail_hooks.py @@ -32,14 +32,11 @@ ) from markup_doc.sync_api import sync_collection_from_api from markup_doc.tasks import get_labels, task_sync_journals_from_api, update_xml -<<<<<<< HEAD from xml_manager.wagtail_hooks import ( SPSPackageValidationSnippetViewSet, XMLDocumentHTMLSnippetViewSet, XMLDocumentPDFSnippetViewSet, ) -======= ->>>>>>> 92e3c5e1efc5b93532d4cc264f5c408e416a3ff4 @hooks.register("register_admin_urls") From 6b4488973763e958172b13d92df0371488d3f8e5 Mon Sep 17 00:00:00 2001 From: GitInno <86991526+gitnnolabs@users.noreply.github.com> Date: Mon, 8 Jun 2026 06:57:12 -0300 Subject: [PATCH 2/3] [MarkAPI-112] fix: merge --- markup_doc/wagtail_hooks.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/markup_doc/wagtail_hooks.py b/markup_doc/wagtail_hooks.py index ccf6eef..6597973 100644 --- a/markup_doc/wagtail_hooks.py +++ b/markup_doc/wagtail_hooks.py @@ -1,4 +1,3 @@ -from config.menu import get_menu_order from django.db import transaction from django.http import HttpResponseRedirect from django.template.response import TemplateResponse @@ -6,7 +5,6 @@ from django.urls import path from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ -from reference.wagtail_hooks import ReferenceModelViewSet from wagtail import hooks from wagtail.admin import messages from wagtail.snippets.models import register_snippet @@ -16,11 +14,8 @@ SnippetViewSet, SnippetViewSetGroup, ) -from xml_manager.wagtail_hooks import ( - XMLDocumentHTMLSnippetViewSet, - XMLDocumentPDFSnippetViewSet, -) +from config.menu import get_menu_order from markup_doc import views from markup_doc.models import ( CollectionModel, @@ -32,6 +27,7 @@ ) from markup_doc.sync_api import sync_collection_from_api from markup_doc.tasks import get_labels, task_sync_journals_from_api, update_xml +from reference.wagtail_hooks import ReferenceModelViewSet from xml_manager.wagtail_hooks import ( SPSPackageValidationSnippetViewSet, XMLDocumentHTMLSnippetViewSet, @@ -190,6 +186,18 @@ def index_view(self, request): return response +class ProcessedDocxViewSet(SnippetViewSet): + model = ProcessedDocx + menu_label = _("Validar XREF") + menu_icon = "doc-full-inverse" + add_to_admin_menu = False + exclude_from_explorer = False + list_per_page = 20 + list_display = ("title", "get_estatus_display", "get_marked_file_status") + search_fields = ("title",) + list_filter = ("estatus",) + + class IssueViewSet(SnippetViewSet): model = Issue menu_label = _("FascĂ­culos") @@ -209,6 +217,7 @@ class XMLSPSSnippetViewSetGroup(SnippetViewSetGroup): items = ( MarkupXMLViewSet, SPSPackageValidationSnippetViewSet, + ProcessedDocxViewSet, XMLDocumentPDFSnippetViewSet, XMLDocumentHTMLSnippetViewSet, ) @@ -222,6 +231,7 @@ class ScieloSnippetViewSetGroup(SnippetViewSetGroup): items = ( CollectionModelViewSet, JournalModelViewSet, + IssueViewSet, ) @@ -233,7 +243,6 @@ class MarkupSnippetViewSetGroup(SnippetViewSetGroup): items = ( UploadDocxViewSet, XMLSPSSnippetViewSetGroup, - IssueViewSet, ) From 8f9fa026d76be35eca21ae697065b7f08678c4dd Mon Sep 17 00:00:00 2001 From: GitInno <86991526+gitnnolabs@users.noreply.github.com> Date: Mon, 8 Jun 2026 07:00:48 -0300 Subject: [PATCH 3/3] Merge branch 'main' of github.com:scieloorg/markapi into MarkupAPI-112-order-menu --- markup_doc/wagtail_hooks.py | 1 - 1 file changed, 1 deletion(-) diff --git a/markup_doc/wagtail_hooks.py b/markup_doc/wagtail_hooks.py index fd0a336..e7b6d5c 100644 --- a/markup_doc/wagtail_hooks.py +++ b/markup_doc/wagtail_hooks.py @@ -250,7 +250,6 @@ class MarkupSnippetViewSetGroup(SnippetViewSetGroup): menu_order = get_menu_order("markup_doc") items = ( UploadDocxViewSet, - ProcessedDocxViewSet, XMLSPSSnippetViewSetGroup, )