Merge pull request #163 from Xpirix/fix_feed_review_process

Fix feed review process

Author: Xpirix

qgisfeedproject/qgisfeed/forms.py

@@ -5,6 +5,7 @@
 
 from .languages import LANGUAGES
 from .models import CharacterLimitConfiguration, QgisFeedEntry
+from .utils import get_content_plain_text_length
 
 
 class HomePageFilterForm(forms.Form):
@@ -198,9 +199,11 @@ def clean_content(self):
         except CharacterLimitConfiguration.DoesNotExist:
             content_max_length = 500
 
-        if len(content) > content_max_length:
+        content_length = get_content_plain_text_length(content)
+
+        if content_length > content_max_length:
             raise ValidationError(
-                f"Ensure this value has at most {str(content_max_length)} characters (it has {str(len(content))})."
+                f"Ensure this value has at most {str(content_max_length)} characters (it has {str(content_length)})."
             )
         return content
 

qgisfeedproject/qgisfeed/migrations/0017_feedentryrevision_field_changes.py

@@ -0,0 +1,21 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("qgisfeed", "0016_qgisfeedentry_reviewers_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="feedentryrevision",
+            name="field_changes",
+            field=models.JSONField(
+                blank=True,
+                default=list,
+                help_text="Structured list of per-field old→new changes",
+                verbose_name="Field Changes",
+            ),
+        ),
+    ]

qgisfeedproject/qgisfeed/migrations/0018_alter_feedentryreview_options.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.24 on 2026-03-03 17:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("qgisfeed", "0017_feedentryrevision_field_changes"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="feedentryreview",
+            options={
+                "ordering": ["created_at"],
+                "verbose_name": "Feed Entry Review",
+                "verbose_name_plural": "Feed Entry Reviews",
+            },
+        ),
+    ]

qgisfeedproject/qgisfeed/models.py

@@ -20,7 +20,7 @@
 from django.utils.translation import gettext as _
 from imagekit.models import ProcessedImageField
 from imagekit.processors import ResizeToFill
-from qgisfeed.utils import simplify
+from qgisfeed.utils import get_content_plain_text_length, simplify
 from user_visit.models import UserVisit
 
 from .languages import LANGUAGES
@@ -349,9 +349,11 @@ def save(self, *args, **kwargs):
         except CharacterLimitConfiguration.DoesNotExist:
             content_max_length = 500
 
-        if len(self.content) > content_max_length:
+        content_length = get_content_plain_text_length(self.content)
+
+        if content_length > content_max_length:
             raise ValidationError(
-                f"Ensure content value has at most {str(content_max_length)} characters (it has {str(len(self.content))})."
+                f"Ensure content value has at most {str(content_max_length)} characters (it has {str(content_length)})."
             )
 
         super(QgisFeedEntry, self).save(*args, **kwargs)
@@ -422,7 +424,7 @@ class FeedEntryRevision(models.Model):
         get_user_model(), on_delete=models.CASCADE, verbose_name=_("Modified by")
     )
 
-    # Snapshot of changed fields
+    # Snapshot of changed fields (kept for backward-compat / full-text auditing)
     title = models.CharField(_("Title"), max_length=255)
     content = models.TextField(_("Content"))
     url = models.URLField(_("URL"), max_length=200, blank=True, null=True)
@@ -436,6 +438,14 @@ class FeedEntryRevision(models.Model):
         help_text=_("Brief description of what changed"),
     )
 
+    # Per-field diff: list of {"label": ..., "old": ..., "new": ...}
+    field_changes = models.JSONField(
+        _("Field Changes"),
+        default=list,
+        blank=True,
+        help_text=_("Structured list of per-field old→new changes"),
+    )
+
     class Meta:
         ordering = ["-changed_at"]
         verbose_name = _("Feed Entry Revision")