wbwriter 1.48.0__tar.gz → 1.49.1__tar.gz

{wbwriter-1.48.0 → wbwriter-1.49.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbwriter
-Version: 1.48.0
+Version: 1.49.1
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: pillow==9.1.*
 Requires-Dist: reportlab==3.*

{wbwriter-1.48.0 → wbwriter-1.49.1}/wbwriter/models/article.py

@@ -13,6 +13,7 @@ from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models import Count, Max, OuterRef, Subquery
 from django.db.models.functions import Coalesce
+from django.utils.translation import gettext_lazy
 from django_fsm import FSMField, transition
 from dynamic_preferences.registries import global_preferences_registry
 from modeltrans.fields import TranslationField
@@ -771,14 +772,14 @@ class Article(CloneMixin, TagModelMixin, PublishableMixin, WBModel):
         """Allow only one-off and deep-dive articles to be published."""
         errors = dict()
         if self.status not in [self.Status.APPROVED, self.Status.PUBLISHED]:
-            errors["status"] = "Status needs to be approved in order to allow publication"
+            errors["status"] = [gettext_lazy("Status needs to be approved in order to allow publication")]
         if not self.type or self.type.slug not in [
             "one-off-article",
             "deep-dive-article",
             "mid-year-review",
             "year-s-favorites",
         ]:
-            errors["type"] = "unvalid type for publication"
+            errors["type"] = [gettext_lazy("unvalid type for publication")]
         # We ensure the article's parser can be published
         if article_type := self.type:
             for parser in article_type.parsers.all():
@@ -788,9 +789,9 @@ class Article(CloneMixin, TagModelMixin, PublishableMixin, WBModel):
                         date.today(),
                     ).is_valid()
                 except ParserValidationException as e:
-                    errors["non_field_errors"] = ", ".join(e.errors)
+                    errors["non_field_errors"] = e.errors
                 except ModuleNotFoundError:
-                    errors["non_field_errors"] = "invalid parser"
+                    errors["non_field_errors"] = [gettext_lazy("invalid parser")]
         return errors
 
     def can_be_published(self) -> bool:

{wbwriter-1.48.0 → wbwriter-1.49.1}/wbwriter/serializers/article.py

@@ -243,6 +243,8 @@ def _get_plugin_configs(request):
 class ArticleFullModelSerializer(ArticleModelSerializer):
     """Serializes the full set of the fields of of the Article model."""
 
+    is_private_icon = wb_serializers.IconSelectField(read_only=True)
+
     author = wb_serializers.PrimaryKeyRelatedField(
         many=False,
         label="Author",
@@ -337,6 +339,7 @@ class ArticleFullModelSerializer(ArticleModelSerializer):
         model = Article
         fields = (
             "id",
+            "is_private_icon",
             "name",
             "title",
             "slug",

{wbwriter-1.48.0 → wbwriter-1.49.1}/wbwriter/viewsets/article.py

@@ -1,5 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Q, QuerySet
+from django.db.models import Case, Q, QuerySet, Value, When
 from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
 from rest_framework import status
@@ -9,6 +9,7 @@ from reversion.views import RevisionMixin
 from wbcore.contrib.authentication.authentication import JWTCookieAuthentication
 from wbcore.contrib.directory.models import Person
 from wbcore.contrib.i18n.viewsets import ModelTranslateMixin
+from wbcore.contrib.icons import WBIcon
 from wbcore.utils.views import CloneMixin
 from wbcore.viewsets import ModelViewSet, RepresentationViewSet
 
@@ -106,7 +107,9 @@ class ArticleModelViewSet(
     # LIST_DOCUMENTATION = "wbwriter/viewsets/documentation/article.md"
 
     serializer_class = ArticleFullModelSerializer
-    queryset = Article.objects.all()
+    queryset = Article.objects.annotate(
+        is_private_icon=Case(When(is_private=False, then=Value(WBIcon.VIEW.icon)), default=Value(WBIcon.IGNORE.icon))
+    )
 
     button_config_class = ArticleModelButtonConfig
     display_config_class = ArticleDisplayConfig
@@ -139,10 +142,9 @@ class ArticleModelViewSet(
         return ContentType.objects.get(app_label="wbwriter", model="article")
 
     def get_queryset(self):
-        if self.request.user.has_perm("wbwriter.administrate_article") or self.profile.is_internal:
-            qs = Article.objects.all()
-        else:
-            qs = Article.objects.filter(is_private=False)
+        qs = super().get_queryset()
+        if not self.request.user.has_perm("wbwriter.administrate_article") and not self.profile.is_internal:
+            qs = qs.filter(is_private=False)
         return qs.select_related(
             "type", "feedback_contact", "reviewer", "peer_reviewer", "qa_reviewer", "author"
         ).prefetch_related("tags")

{wbwriter-1.48.0 → wbwriter-1.49.1}/wbwriter/viewsets/display/article.py

@@ -3,7 +3,7 @@ from typing import Optional
 from django.utils.translation import gettext as _
 from wbcore.contrib.color.enums import WBColor
 from wbcore.contrib.icons import WBIcon
-from wbcore.enums import Operator
+from wbcore.enums import Operator, Unit
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.instance_display import (
     Display,
@@ -264,6 +264,7 @@ class ArticleDisplayConfig(DisplayViewConfig):
         """Sets up and returns the list display for Article."""
         return dp.ListDisplay(
             fields=[
+                dp.Field(key="is_private_icon", label=" ", width=Unit.PIXEL(40)),
                 dp.Field(key="id", label=_("ID")),
                 dp.Field(key="title", label=_("Title")),
                 dp.Field(key="teaser_image", label=_("Teaser image")),
@@ -330,20 +331,7 @@ class ArticleDisplayConfig(DisplayViewConfig):
                         ),
                     ],
                     column="status",
-                ),
-                dp.Formatting(
-                    formatting_rules=[
-                        dp.FormattingRule(
-                            icon=WBIcon.IGNORE.icon,
-                            condition=("==", True),
-                        ),
-                        dp.FormattingRule(
-                            icon=WBIcon.VIEW.icon,
-                            condition=("==", False),
-                        ),
-                    ],
-                    column="is_private",
-                ),
+                )
             ],
             legends=[
                 dp.Legend(