Merge pull request #124 from PiotrIw/fix_issues

v1.5.58 - fix issues

Author: PiotrIw

config/settings/common.py

@@ -464,11 +464,12 @@
 
 TINYMCE_DEFAULT_CONFIG = {
     "theme": "silver",
+    "promotion": False,
     # "height": 500,
     "menubar": True,
     "lineheight": 1,
-    "plugins": "autolink,lists,link,image,charmap,print,preview,anchor,"
-    "searchreplace,visualblocks,code,fullscreen,insertdatetime,media,table,paste,"
+    "plugins": "autolink,lists,link,image,charmap,preview,anchor,"
+    "searchreplace,visualblocks,code,fullscreen,insertdatetime,media,table,"
     "code,help,wordcount",
     "toolbar": "undo redo | formatselect | lineheight | fontsizeselect |"
     "bold italic backcolor | alignleft aligncenter "

feder/__init__.py

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

feder/letters/migrations/0045_alter_attachment_options_alter_attachment_attachment.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.10 on 2026-01-12 13:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('letters', '0044_alter_attachment_options_attachment_created_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='attachment',
+            options={'verbose_name': 'Attachment', 'verbose_name_plural': 'Attachments'},
+        ),
+        migrations.AlterField(
+            model_name='attachment',
+            name='attachment',
+            field=models.FileField(max_length=500, upload_to='letters/%Y/%m/%d', verbose_name='File'),
+        ),
+    ]

feder/letters/models.py

@@ -4,9 +4,9 @@
 import logging
 import uuid
 from email.utils import getaddresses
+from os.path import basename
 
 import requests
-from atom.models import AttachmentBase
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.fields import GenericRelation
@@ -774,7 +774,10 @@ def with_scan_result(self):
         return self.prefetch_related("scan_request")
 
 
-class Attachment(TimeStampedModel, AttachmentBase):
+class Attachment(TimeStampedModel):
+    attachment = models.FileField(
+        upload_to="letters/%Y/%m/%d", verbose_name=_("File"), max_length=500
+    )
     letter = models.ForeignKey(Letter, on_delete=models.CASCADE)
     objects = AttachmentQuerySet.as_manager()
     scan_request = GenericRelation(ScanRequest, verbose_name=_("Virus scan request"))
@@ -785,6 +788,14 @@ class Attachment(TimeStampedModel, AttachmentBase):
         verbose_name=_("Text content update result"), blank=True, null=True
     )
 
+    class Meta:
+        verbose_name = _("Attachment")
+        verbose_name_plural = _("Attachments")
+
+    @property
+    def filename(self):
+        return basename(self.attachment.name)
+
     def current_scan_request(self):
         scans = self.scan_request.all()
         if scans:

feder/letters/views.py

@@ -749,7 +749,11 @@ def post(self, request):
     def get_letter(self, headers, eml_manifest, text, eml_data, **kwargs):
         case = self.get_case(headers["to+"])
         eml_file = self.get_eml_file(eml_manifest, eml_data)
-        from_email = headers["from"][0] if headers["from"][0] else "unknown@domain.gov"
+        from_email = (
+            headers["from"][0]
+            if headers["from"] and headers["from"][0]
+            else "unknown@domain.gov"
+        )
 
         auto_reply = headers.get("auto_reply_type")
         if auto_reply is not None:

feder/main/urls.py

@@ -77,6 +77,9 @@
 if "rosetta" in settings.INSTALLED_APPS:
     urlpatterns += [path("rosetta/", include("rosetta.urls"))]
 
+if "tinymce" in settings.INSTALLED_APPS:
+    urlpatterns += [path("tinymce/", include("tinymce.urls"))]
+
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 sitemaps = {