Rc merge main 20260324 upload (from v2.12.0rc2)

VERSION

@@ -1 +1 @@
-v2.12.1rc
+v3.0.0rc21

article/migrations/0008_add_unique_pid_v3.py

@@ -38,11 +38,4 @@ class Migration(migrations.Migration):
             model_name="article",
             name="article_art_pid_v3_2370cc_idx",
         ),
-        migrations.AlterField(
-            model_name="article",
-            name="pid_v3",
-            field=models.CharField(
-                blank=True, max_length=23, null=True, unique=True, verbose_name="PID v3"
-            ),
-        ),
     ]

article/migrations/0009_alter_article_pid_v3_unique.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.3 on 2026-03-16 23:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("article", "0008_add_unique_pid_v3"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="article",
+            name="pid_v3",
+            field=models.CharField(
+                blank=True, max_length=23, null=True, unique=True, verbose_name="PID v3"
+            ),
+        ),
+    ]

config/menu.py

@@ -1,6 +1,7 @@
 WAGTAIL_MENU_APPS_ORDER = [
-    "Tarefas",
+    None,
     "unexpected-error",
+    "Tasks",
     "processing",
     "migration",
     "journal",
@@ -16,11 +17,13 @@
     "Images",
     "Documentos",
     "Ajuda",
+    "upload",
+    "upload-error",
 ]
 
 
 def get_menu_order(app_name):
     try:
-        return WAGTAIL_MENU_APPS_ORDER.index(app_name) + 1
+        return WAGTAIL_MENU_APPS_ORDER.index(app_name)
     except:
         return 9000

config/settings/base.py

@@ -135,7 +135,7 @@
     "proc",
     "publication",
     "researcher",
-    # "upload",
+    "upload",
     "pid_provider",
     "team",
     "tracker",

core/forms.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from wagtail.admin.forms import WagtailAdminModelForm
 
@@ -9,10 +9,10 @@ def save_all(self, user):
 
         if self.instance.pk is None:
             model_with_creator.creator = user
-            model_with_creator.created = datetime.utcnow()
+            model_with_creator.created = datetime.now(timezone.utc)
         else:
             model_with_creator.updated_by = user
-            model_with_creator.updated = datetime.utcnow()
+            model_with_creator.updated = datetime.now(timezone.utc)
         self.save()
 
         return model_with_creator

core/views.py

@@ -1,42 +1,115 @@
-from django.http import HttpResponseRedirect
+"""
+ViewSet base com tracking automático de creator/updated_by.
+
+Qualquer app que use models com os campos creator e updated_by
+(herdados de CommonControlField ou equivalente) deve usar
+CommonControlFieldViewSet como base do seu SnippetViewSet.
+
+Uso:
+    class MeuViewSet(CommonControlFieldViewSet):
+        model = MeuModel
+        # add_view_class e edit_view_class já vêm configurados
+        # permission_policy já vem com BaseSciELOPermissionPolicy
+
+    Se o app precisar de uma CreateView ou EditView customizada,
+    herde das classes internas para manter o tracking:
 
-from django.utils.translation import gettext_lazy as _
+        class MinhaCreateView(CommonControlFieldViewSet.UserTrackingCreateView):
+            def save_instance(self):
+                instance = super().save_instance()
+                # lógica adicional
+                return instance
+
+        class MeuViewSet(CommonControlFieldViewSet):
+            add_view_class = MinhaCreateView
+"""
+
+from django.utils import timezone
+from django.http import HttpResponseRedirect
 from wagtail.snippets.views.snippets import CreateView, EditView, SnippetViewSet
-from wagtail.admin import messages
 
+from core.permission_helper import StaffWritePolicy
+
+
+class UserTrackingCreateView(CreateView):
+    """
+    CreateView que seta creator e updated_by automaticamente.
+    Chama super().save_instance() para preservar a lógica do Wagtail
+    (logs, revisões, etc.) e ajusta os campos antes do save.
+
+    Subclasses que precisem de lógica adicional no form_valid
+    podem sobrescrever, chamando self.save_instance() para o save:
+
+        def form_valid(self, form):
+            instance = self.save_instance()
+            # lógica adicional
+            return HttpResponseRedirect(self.get_success_url())
+    """
+
+    def save_instance(self):
+        instance = self.form.save(commit=False)
+        if not instance.pk:
+            instance.creator = self.request.user
+        instance.updated_by = self.request.user
+        instance.save()
+        self.form.save_m2m()
+        return instance
 
-class CommonControlFieldCreateView(CreateView):
     def form_valid(self, form):
-        self.object = form.save_all(self.request.user)
+        self.object = self.save_instance()
+        return HttpResponseRedirect(self.get_success_url())
+
+
+class UserTrackingEditView(EditView):
+    """
+    EditView que seta updated_by automaticamente.
+
+    Subclasses que precisem de lógica adicional no form_valid
+    podem sobrescrever, chamando self.save_instance() para o save:
+
+        def form_valid(self, form):
+            instance = self.save_instance()
+            # lógica adicional
+            return HttpResponseRedirect(self.get_success_url())
+    """
+
+    def save_instance(self):
+        instance = self.form.save(commit=False)
+        instance.updated_by = self.request.user
+        instance.save()
+        self.form.save_m2m()
+        return instance
+
+    def form_valid(self, form):
+        self.object = self.save_instance()
         return HttpResponseRedirect(self.get_success_url())
 
 
 class CommonControlFieldViewSet(SnippetViewSet):
     """
-    Mixin para adicionar tracking de usuário em qualquer SnippetViewSet
-    Compatível com Wagtail 6.4.2
+    SnippetViewSet base para models com campos creator/updated_by.
+
+    Fornece:
+    - UserTrackingCreateView: seta creator (na criação) e updated_by
+    - UserTrackingEditView: seta updated_by
+    - BaseSciELOPermissionPolicy como permission_policy padrão
+
+    Nota sobre timestamps:
+    - Se o model usa `updated = DateTimeField(auto_now=True)`, o Django
+      atualiza automaticamente ao chamar save().
+    - Se NÃO usa auto_now, descomente a linha de updated nas views acima.
     """
 
-    class UserTrackingCreateView(CreateView):
-        def save_instance(self):
-            instance = self.form.save(commit=False)
-            if not instance.pk:
-                instance.creator = self.request.user
-            instance.updated_by = self.request.user
-            instance.save()
-            if hasattr(self.form, "save_m2m"):
-                self.form.save_m2m()
-            return instance
-
-    class UserTrackingEditView(EditView):
-        def save_instance(self):
-            instance = self.form.save(commit=False)
-            instance.updated_by = self.request.user
-            instance.save()
-            if hasattr(self.form, "save_m2m"):
-                self.form.save_m2m()
-            return instance
-
-    # Define as views customizadas
     add_view_class = UserTrackingCreateView
     edit_view_class = UserTrackingEditView
+
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        # Se a subclasse tem model e não definiu policy própria,
+        # cria uma StaffWritePolicy como default
+        if (
+            hasattr(cls, "model")
+            and cls.model is not None
+            and "permission_policy" not in cls.__dict__
+        ):
+            cls.permission_policy = StaffWritePolicy(cls.model)

journal/forms.py

@@ -13,3 +13,10 @@ def save_all(self, user):
         self.save()
 
         return journal
+
+
+class JournalTOCForm(CoreAdminModelForm):
+    def save_all(self, user):
+        obj = super().save_all(user)
+        self.save()
+        return obj

journal/models.py

@@ -21,7 +21,7 @@
     MissionGetError,
     SubjectCreationOrUpdateError,
 )
-from journal.forms import OfficialJournalForm
+from journal.forms import OfficialJournalForm, JournalTOCForm
 from location.models import Location
 
 

migration/models.py

@@ -870,15 +870,6 @@ class IdFileRecord(CommonControlField, Orderable):
     data = models.JSONField()
     item_pid = models.CharField(_("PID"), max_length=23)
     item_type = models.CharField(_("Type"), max_length=10)
-    # issue_folder = models.CharField(_("Issue folder"), max_length=30)
-    # article_filename = models.CharField(
-    #     _("Filename"), max_length=40, null=True, blank=True
-    # )
-    # article_filetype = models.CharField(
-    #     _("File type"), max_length=4, null=True, blank=True
-    # )
-    # processing_date = models.CharField(max_length=8, null=True, blank=True)
-    # deleted = models.BooleanField(default=False)
     todo = models.BooleanField(default=True)
 
     panels = [
@@ -1047,3 +1038,10 @@ def document_records_to_migrate(cls, collection, issue_pid, force_update):
         if not force_update:
             params["todo"] = True
         return cls.objects.filter(item_type="article", **params)
+
+    @classmethod
+    def add_issue_folder(cls, issue_pid, issue_folder):
+        return cls.objects.filter(
+            Q(item_pid__startswith=f"S{issue_pid}") | Q(item_pid=issue_pid),
+            issue_folder__in=["", None]
+        ).update(issue_folder=issue_folder)

proc/tasks.py

@@ -3,7 +3,6 @@
 import traceback
 
 from django.contrib.auth import get_user_model
-from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
 from article.models import Article
@@ -665,6 +664,7 @@ def task_publish_issues(
     }
 
     try:
+        user = _get_user(user_id, username)
         params = {}
         if journal_acron:
             params["journal_proc__acron"] = journal_acron

team/migrations/0004_rename_team_collec_collect_idx_team_collec_collect_0ee96e_idx_and_more.py

@@ -0,0 +1,48 @@
+# Generated by Django 5.2.3 on 2026-02-19 18:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("team", "0003_add_role_to_collectionteammember"),
+    ]
+
+    operations = [
+        migrations.RenameIndex(
+            model_name="collectionteammember",
+            new_name="team_collec_collect_0ee96e_idx",
+            old_name="team_collec_collect_idx",
+        ),
+        migrations.RenameIndex(
+            model_name="collectionteammember",
+            new_name="team_collec_user_id_6382ef_idx",
+            old_name="team_collec_user_id_idx",
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="certified_since",
+            field=models.DateField(
+                blank=True, null=True, verbose_name="Certified Since"
+            ),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="logo",
+            field=models.ImageField(
+                blank=True, null=True, upload_to="logos/", verbose_name="Logo"
+            ),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="personal_contact",
+            field=models.CharField(
+                blank=True, max_length=30, null=True, verbose_name="Personal Contact"
+            ),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="url",
+            field=models.URLField(blank=True, null=True, verbose_name="URL"),
+        ),
+    ]