Merge pull request watchdogpolska#2256 from watchdogpolska/develop

v1.5.50 fixes and upgrades

Author: PiotrIw

.github/workflows/frontend.yml

@@ -13,7 +13,7 @@ jobs:
   regenerate_frontend:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Collect statics
         run: docker compose run web python manage.py collectstatic --noinput
       - name: Build and run frontend

.github/workflows/web.yml

@@ -19,7 +19,7 @@ jobs:
 # #          - "==2.2.*"
 #           - "==4.2"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           lfs: true
       - name: Build application

.github/workflows/web_image_buil_and_push.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.event.pull_request.merged == true && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get version from script
         id: get_version

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ default_language_version:
 minimum_pre_commit_version: "1.20.0"
 repos:
     - repo: https://github.com/adamchainz/django-upgrade
-      rev: 1.25.0
+      rev: 1.28.0
       hooks:
           - id: django-upgrade
             args: [--target-version, "4.2"]
@@ -39,7 +39,7 @@ repos:
                 - --skip-glob
                 - "**/migrations/*.py"
     - repo: https://github.com/sirosen/check-jsonschema
-      rev: 0.33.2
+      rev: 0.34.0
       hooks:
           - id: check-github-workflows
           - id: check-readthedocs
@@ -50,7 +50,7 @@ repos:
             args: [-c, .yamllint.yml]
       #        exclude: (feder/letters/logs/cassettes/.*|docker-compose.yml)
     - repo: https://github.com/psf/black
-      rev: 25.1.0
+      rev: 25.9.0
       hooks:
           - id: black
             args:

config/settings/common.py

@@ -37,6 +37,7 @@
 )
 THIRD_PARTY_APPS = (
     "crispy_forms",  # Form layouts
+    "crispy_bootstrap3",  # Bootstrap 3 theme for crispy forms
     "allauth",  # registration
     "allauth.account",  # registration
     "allauth.socialaccount",  # registration
@@ -230,7 +231,11 @@
 ]
 
 # See: http://django-crispy-forms.readthedocs.org/en/latest/install.html#template-packs
+CRISPY_ALLOWED_TEMPLATE_PACKS = [
+    "bootstrap3",
+]
 CRISPY_TEMPLATE_PACK = "bootstrap3"
+CRISPY_FAIL_SILENTLY = False
 
 # STATIC FILE CONFIGURATION
 # ------------------------------------------------------------------------------
@@ -273,16 +278,16 @@
 )
 
 # Some really nice defaults
-ACCOUNT_AUTHENTICATION_METHOD = "username_email"
-ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_LOGIN_METHODS = {"email", "username"}
+ACCOUNT_SIGNUP_FIELDS = ["email*", "username*", "password1*", "password2*"]
 ACCOUNT_EMAIL_VERIFICATION = "mandatory"
 # NoSignupAdapter disables the signup functionality - new users to be
 # manually added by admins
 ACCOUNT_ADAPTER = "feder.main.adapters.NoSignupAdapter"
 SOCIALACCOUNT_EMAIL_VERIFICATION = "optional"
 SOCIALACCOUNT_PROVIDERS = {
     "github": {"SCOPE": ["user"]},
-    "gilab": {"SCOPE": ["read_user", "openid"]},
+    "gitlab": {"SCOPE": ["read_user", "openid"]},
 }
 # Custom user app defaults
 # Select the correct user model

feder/__init__.py

@@ -1,5 +1,5 @@
 # PEP 396: The __version__ attribute's value SHOULD be a string.
-__version__ = "1.5.48"
+__version__ = "1.5.50"
 
 
 # Compatibility to eg. django-rest-framework

feder/letters/forms.py

@@ -5,7 +5,10 @@
 from django import forms
 from django.conf import settings
 from django.contrib import messages
+from django.contrib.admin.models import ADDITION, CHANGE, LogEntry
+from django.contrib.contenttypes.models import ContentType
 from django.template.loader import render_to_string
+from django.utils.encoding import force_str
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from tinymce.widgets import TinyMCE
@@ -103,6 +106,19 @@ def save(self, *args, **kwargs):
         ):
             self.instance.author_user = self.user
         if not self.instance.is_mass_draft() and "ai_evaluation" in self.changed_data:
+            change_dict = {
+                "changed": self.changed_data,
+                "ai_evaluation_previous": self.initial.get("ai_evaluation", None),
+                "ai_evaluation_new": self.cleaned_data.get("ai_evaluation", None),
+            }
+            LogEntry.objects.log_action(
+                user_id=self.request.user.id,
+                content_type_id=ContentType.objects.get_for_model(self.instance).pk,
+                object_id=self.instance.pk,
+                object_repr=force_str(self.instance),
+                action_flag=CHANGE,
+                change_message=f"{change_dict}",
+            )
             update_letter_normalized_answers(self.instance.pk)
             messages.success(
                 self.request,
@@ -119,6 +135,22 @@ def save(self, *args, **kwargs):
                     case=self.cleaned_data["case"]
                 )
             self.instance.record.save()
+            change_dict = {
+                "changed": self.changed_data,
+                "new_case": self.cleaned_data["case"].pk,
+                "previous_case": self.initial["case"].pk,
+                "letter": self.instance.pk,
+            }
+            LogEntry.objects.log_action(
+                user_id=self.request.user.id,
+                content_type_id=ContentType.objects.get_for_model(
+                    self.instance.record
+                ).pk,
+                object_id=self.instance.record.pk,
+                object_repr=force_str(self.instance.record),
+                action_flag=CHANGE,
+                change_message=f"{change_dict}",
+            )
             if "ai_evaluation" not in self.changed_data:
                 categorize_letter_in_background(self.instance.pk)
                 messages.success(
@@ -130,6 +162,21 @@ def save(self, *args, **kwargs):
                 )
         if not hasattr(self.instance, "record"):
             self.instance.record = Record.objects.create(case=self.cleaned_data["case"])
+            change_dict = {
+                "changed": self.changed_data,
+                "new_case": self.cleaned_data["case"].pk,
+                "letter": self.instance.pk,
+            }
+            LogEntry.objects.log_action(
+                user_id=self.request.user.id,
+                content_type_id=ContentType.objects.get_for_model(
+                    self.instance.record
+                ).pk,
+                object_id=self.instance.record.pk,
+                object_repr=force_str(self.instance.record),
+                action_flag=ADDITION,
+                change_message=f"{change_dict}",
+            )
         self.instance.save()
         return super().save(*args, **kwargs)
 
@@ -278,6 +325,20 @@ def save(self):
         self.letter.case = self.cleaned_data["case"]
         self.letter.record.save()
         self.letter.case.save()
+        chang_dict = {
+            "changed": ["case"],
+            "new_case": self.cleaned_data["case"].pk,
+            "previous_case": None,
+            "letter": self.letter.pk,
+        }
+        LogEntry.objects.log_action(
+            user_id=self.request.user.id,
+            content_type_id=ContentType.objects.get_for_model(self.letter.record).pk,
+            object_id=self.letter.record.pk,
+            object_repr=force_str(self.letter.record),
+            action_flag=CHANGE,
+            change_message=f"{chang_dict}",
+        )
         categorize_letter_in_background(self.letter.pk)
         messages.success(
             self.request,

feder/letters/formsets.py

@@ -1,10 +1,10 @@
-from atom.ext.crispy_forms.forms import BaseTableFormSet
 from extra_views import InlineFormSetFactory
 
 from feder.letters.models import Attachment
+from feder.main.forms import BaseTableFormSetB3
 
 
 class AttachmentInline(InlineFormSetFactory):
     model = Attachment
-    formset_class = BaseTableFormSet
+    formset_class = BaseTableFormSetB3
     fields = ["attachment"]

feder/letters/views.py

@@ -48,6 +48,7 @@
     BaseXSendFileView,
     RaisePermissionRequiredMixin,
 )
+from feder.main.utils import DeleteViewLogEntryMixin
 from feder.monitorings.models import Monitoring
 from feder.monitorings.tasks import send_mass_draft
 from feder.records.models import Record
@@ -328,7 +329,11 @@ def get_form_kwargs(self):
 
 
 class LetterDeleteView(
-    LetterCommonMixin, AttrPermissionRequiredMixin, DeleteMessageMixin, DeleteView
+    LetterCommonMixin,
+    AttrPermissionRequiredMixin,
+    DeleteMessageMixin,
+    DeleteViewLogEntryMixin,
+    DeleteView,
 ):
     model = Letter
     permission_required = "monitorings.delete_letter"
@@ -597,7 +602,10 @@ def update_object_list(self, object_list):
 
 
 class AssignLetterFormView(
-    PrefetchRelatedMixin, RaisePermissionRequiredMixin, SuccessMessageMixin, FormView
+    PrefetchRelatedMixin,
+    RaisePermissionRequiredMixin,
+    SuccessMessageMixin,
+    FormView,
 ):
     model = Letter
     form_class = AssignLetterForm

feder/main/forms.py

@@ -0,0 +1,12 @@
+from crispy_forms.helper import FormHelper
+from django.forms.models import BaseInlineFormSet
+
+
+class BaseTableFormSetB3(BaseInlineFormSet):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        h = FormHelper()
+        h.template_pack = "bootstrap3"
+        h.template = "bootstrap3/table_inline_formset.html"
+        h.form_tag = False  # outer <form> is in the page template
+        self.helper = h