Merge pull request #1827 from watchdogpolska/develop

v1.5.21

docker-compose.yml

@@ -104,14 +104,14 @@ services:
   # mailbox secrets in imap-to-webhook-url.env
   #
   # imap-to-webhook-feder:
-  #   image: quay.io/watchdogpolska/imap-to-webhook:latest
+  #   image: siecobywatelska/imap-to-webhook:latest-prod
   #   environment:
   #     WEBHOOK_URL: "http://web:8000/listy/webhook?secret=dev_letter_rec_very_secret"
   #     SENTRY_DSN: ""
   #     SENTRY_ENVIRONMENT: "feder-dev"
   #     COMPRESS_EML: "True"
   #   env_file:
-  #     - secrets_imap-to-webhook-url.env:optional
+  #     - secrets_imap-to-webhook-url.env
 
 volumes:
   mysql-data:

feder/__init__.py

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

feder/letters/forms.py

@@ -95,8 +95,8 @@ def save(self, *args, **kwargs):
         self.instance.body = html_to_text(self.cleaned_data["html_body"])
         if (
             not (
-                self.fields["html_body"].widget.attrs["readonly"]
-                or self.fields["title"].widget.attrs["readonly"]
+                self.fields["html_body"].widget.attrs.get("readonly", False)
+                or self.fields["title"].widget.attrs.get("readonly", False)
             )
             and ("title" in self.changed_data or "html_body" in self.changed_data)
             and not self.instance.author_institution
@@ -128,8 +128,9 @@ def save(self, *args, **kwargs):
                         + " categorization and upadte normalized answers created"
                     ),
                 )
+        if not hasattr(self.instance, "record"):
+            self.instance.record = Record.objects.create(case=self.cleaned_data["case"])
         self.instance.save()
-
         return super().save(*args, **kwargs)
 
 

secrets_imap-to-webhook-url.env.example

@@ -1 +1 @@
-IMAP_URL="imap+ssl://imap_mailbox_user:imap_mailbox_password@imap_mailbox_server"
+IMAP_URL=imap://imap_mailbox_user:imap_mailbox_password@imap_mailbox_server