wagtail 6.1.2__py3-none-any.whl → 6.2__py3-none-any.whl

wagtail/admin/locale/zh_Hant/LC_MESSAGES/djangojs.po

@@ -4,11 +4,11 @@
 # Yeh Yen-Ke <yyken@outlook.com>, 2022
 # Brian Xu, 2022
 # Chih Wang <ihcgno@icloud.com>, 2022
-# Loic Teixeira, 2022
+# Loic Teixeira, 2024
 #
 msgid ""
 msgstr ""
-"Last-Translator: Loic Teixeira, 2022\n"
+"Last-Translator: Loic Teixeira, 2024\n"
 "Language-Team: Chinese Traditional (https://app.transifex.com/torchbox/"
 "teams/8009/zh-Hant/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,6 +121,12 @@ msgid ""
 "The editor just crashed. Content has been reset to the last saved version."
 msgstr "編輯器崩潰了，內容被重新設置為最後保存的版本。"
 
+msgid "The maximum number of items is %(max_num)d"
+msgstr "條目的最大數是%(max_num)d"
+
+msgid "The minimum number of items is %(min_num)d"
+msgstr "條目的最小數是%(min_num)d"
+
 msgid "This field is required."
 msgstr "必要欄位"
 

wagtail/admin/menu.py

@@ -228,7 +228,7 @@ class WagtailMenuRegisterable:
             url=self.menu_url,
             name=self.menu_name,
             icon_name=self.menu_icon,
-            order=order or self.menu_order,
+            order=order if order is not None else self.menu_order,
         )
 
     @cached_property
@@ -286,7 +286,7 @@ class WagtailMenuRegisterableGroup(WagtailMenuRegisterable):
             menu=Menu(items=self.get_submenu_items()),
             name=self.menu_name,
             icon_name=self.menu_icon,
-            order=order or self.menu_order,
+            order=order if order is not None else self.menu_order,
         )
 
 

wagtail/admin/migrations/0004_editingsession.py

@@ -0,0 +1,57 @@
+# Generated by Django 5.1a1 on 2024-07-01 16:13
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("wagtailadmin", "0003_admin_managed"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="EditingSession",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("object_id", models.CharField(max_length=255)),
+                ("last_seen_at", models.DateTimeField()),
+                (
+                    "content_type",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="+",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="editing_sessions",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "indexes": [
+                    models.Index(
+                        fields=["content_type", "object_id"],
+                        name="wagtailadmi_content_717955_idx",
+                    )
+                ],
+            },
+        ),
+    ]

wagtail/admin/migrations/0005_editingsession_is_editing.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1a1 on 2024-07-03 19:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("wagtailadmin", "0004_editingsession"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="editingsession",
+            name="is_editing",
+            field=models.BooleanField(default=False),
+        ),
+    ]

wagtail/admin/models.py

@@ -1,5 +1,10 @@
+from django.contrib.auth import get_user_model
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Count, Model
+from django.db import models
+from django.db.models import Count
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from taggit.models import Tag
 
@@ -14,11 +19,11 @@ from wagtail.models import Page
 # A dummy model that exists purely to attach the access_admin permission type to, so that it
 # doesn't get identified as a stale content type and removed by the remove_stale_contenttypes
 # management command.
-class Admin(Model):
+class Admin(models.Model):
     class Meta:
         default_permissions = []  # don't create the default add / change / delete / view perms
         permissions = [
-            ("access_admin", "Can access Wagtail admin"),
+            ("access_admin", _("Can access Wagtail admin")),
         ]
 
 
@@ -67,3 +72,31 @@ def popular_tags_for_model(model, count=10):
         .annotate(item_count=Count("taggit_taggeditem_items"))
         .order_by("-item_count")[:count]
     )
+
+
+class EditingSession(models.Model):
+    user = models.ForeignKey(
+        get_user_model(),
+        on_delete=models.CASCADE,
+        related_name="editing_sessions",
+    )
+    content_type = models.ForeignKey(
+        ContentType, on_delete=models.CASCADE, related_name="+"
+    )
+    object_id = models.CharField(max_length=255)
+    content_object = GenericForeignKey(
+        "content_type", "object_id", for_concrete_model=False
+    )
+    last_seen_at = models.DateTimeField()
+    is_editing = models.BooleanField(default=False)
+
+    @staticmethod
+    def cleanup():
+        EditingSession.objects.filter(
+            last_seen_at__lt=timezone.now() - timezone.timedelta(hours=1)
+        ).delete()
+
+    class Meta:
+        indexes = [
+            models.Index(fields=["content_type", "object_id"]),
+        ]

wagtail/admin/rich_text/editors/draftail/__init__.py

@@ -1,10 +1,9 @@
 import json
 import warnings
 
+from django.core.serializers.json import DjangoJSONEncoder
 from django.forms import Media, widgets
-from django.urls import reverse_lazy
 from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy
 
 from wagtail.admin.rich_text.converters.contentstate import ContentstateConverter
 from wagtail.admin.staticfiles import versioned_static
@@ -13,23 +12,6 @@ from wagtail.telepath import register
 from wagtail.widget_adapters import WidgetAdapter
 
 
-class LazyStringEncoder(json.JSONEncoder):
-    """
-    Add support for lazy strings to the JSON encoder so that URLs and
-    translations can be resolved when rendering the widget only.
-    """
-
-    # The string "Edit" here is arbitrary, chosen because it exists elsewhere in the
-    # translations dictionary and is likely to remain in the future.
-    lazy_string_types = [type(reverse_lazy("Edit")), type(gettext_lazy("Edit"))]
-
-    def default(self, obj):
-        if type(obj) in self.lazy_string_types:
-            return str(obj)
-
-        return json.JSONEncoder.default(self, obj)
-
-
 class DraftailRichTextArea(widgets.HiddenInput):
     template_name = "wagtailadmin/widgets/draftail_rich_text_area.html"
     is_hidden = False
@@ -90,7 +72,7 @@ class DraftailRichTextArea(widgets.HiddenInput):
         context = super().get_context(name, value, attrs)
         context["widget"]["attrs"]["data-w-init-detail-value"] = json.dumps(
             self.options,
-            cls=LazyStringEncoder,
+            cls=DjangoJSONEncoder,
         )
         return context