django-codenerix-email 4.0.20__py2.py3-none-any.whl → 4.0.21__py2.py3-none-any.whl

codenerix_email/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.20"
+__version__ = "4.0.21"
 
 __authors__ = [
     "Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>",

codenerix_email/forms.py

@@ -96,6 +96,7 @@ class EmailMessageForm(GenModelForm):
                 ["eto", 3],
                 ["subject", 3],
                 ["opened", 3],
+                ["content_subtype", 3],
             ),
             (
                 _("System"),
@@ -106,6 +107,8 @@ class EmailMessageForm(GenModelForm):
                 ["retries", 3],
                 ["priority", 3],
                 ["log", 3],
+                ["unsubscribe_url", 3],
+                ["headers", 3],
             ),
             (
                 _("Body"),

codenerix_email/migrations/0013_emailmessage_headers.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-10-15 06:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("codenerix_email", "0012_emailmessage_unsubscribe_url"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="emailmessage",
+            name="headers",
+            field=models.JSONField(blank=True, null=True, verbose_name="Headers"),
+        ),
+    ]

codenerix_email/models.py

@@ -49,6 +49,12 @@ CONTENT_SUBTYPES = (
 )
 
 
+def ensure_header(headers, key, value):
+    if key not in headers:
+        headers[key] = value
+    return headers
+
+
 class EmailMessage(CodenerixModel, Debugger):
     uuid = models.UUIDField(
         _("UUID"),
@@ -95,6 +101,7 @@ class EmailMessage(CodenerixModel, Debugger):
     unsubscribe_url = models.URLField(
         _("Unsubscribe URL"), blank=True, null=True
     )
+    headers = models.JSONField(_("Headers"), blank=True, null=True)
 
     def __fields__(self, info):
         fields = []
@@ -111,9 +118,9 @@ class EmailMessage(CodenerixModel, Debugger):
         fields.append(("retries", _("Retries")))
         fields.append(("next_retry", _("Next retry")))
         fields.append(("pk", _("ID")))
-        fields.append(("content_subtype", _("Content Subtype")))
         fields.append(("uuid", _("UUID")))
-        fields.append(("unsubscribe_url", _("Unsubscribe URL")))
+        fields.append(("unsubscribe_url", _("Unsubscribe")))
+        fields.append(("content_subtype", _("Content Subtype")))
         return fields
 
     def __searchQ__(self, info, search):  # noqa: N802
@@ -160,31 +167,36 @@ class EmailMessage(CodenerixModel, Debugger):
             "eto": (_("To"), lambda x: Q(eto__icontains=x), "input"),
             "retries": (_("Retries"), lambda x: Q(retries=x), "input"),
             "pk": (_("ID"), lambda x: Q(pk=x), "input"),
-            "unsubscribe_url": (
-                _("Unsubscribe URL"),
-                lambda x: Q(unsubscribe_url__icontains=x),
-                "input",
-            ),
         }
 
     def __unicode__(self):
         return "{} ({})".format(self.eto, self.pk)
 
+    def clean(self):
+        if not isinstance(self.headers, dict):
+            raise ValidationError(_("HEADERS must be a Dictionary"))
+
     def set_opened(self):
         if not self.opened:
             self.opened = timezone.now()
             self.save()
 
-    @property
-    def headers(self):
-        headers = {}
+    def get_headers(self):
+
+        # Get headers
+        headers = self.headers or {}
+
+        # Ensure unsubscribe headers
         if self.unsubscribe_url:
-            headers["List-Unsubscribe"] = f"<{self.unsubscribe_url}>"
-            headers[
-                "List-Unsubscribe-Post"
-            ] = "List-Unsubscribe=One-Click"
-        return headers
+            ensure_header(
+                headers, "List-Unsubscribe", f"<{self.unsubscribe_url}>"
+            )
+            ensure_header(
+                headers, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click"
+            )
 
+        # Return headers
+        return headers
 
     @classmethod
     def process_queue(
@@ -370,7 +382,7 @@ class EmailMessage(CodenerixModel, Debugger):
                     from_email=self.efrom,
                     to=[self.eto],
                     connection=connection,
-                    headers = self.headers
+                    headers=self.get_headers(),
                 )
                 email.content_subtype = self.content_subtype
                 for at in self.attachments.all():

codenerix_email/static/codenerix_email/partials/emailmessages_rows.html

@@ -17,7 +17,13 @@
 <td><center>{{row.retries|codenerix}}</center></td>
 <td class="text-nowrap">{{row.next_retry|codenerix}}</td>
 <td><center>{{row.pk|codenerix}}</center></td>
-<td>
+<td ng-click="$event.stopPropagation();" align="center">
+    <nobr><i title="{{row.uuid}}" codenerix-html-compile="row.uuid|codenerix:'copytoclipboard:UUID:UUID copiado al portapapales...'"></i></nobr>
+</td>
+<td ng-click="$event.stopPropagation();" align="center">
+    <i codenerix-html-compile="row.unsubscribe_url|codenerix:'link:blank:onlyicon'"></i>
+</td>
+<td ng-click="$event.stopPropagation();">
     <center>
         <button class="btn" title="{{row.content_subtype|codenerix}}">
             <i ng-show="row.content_subtype=='plain'" class="fa fa-file-text-o" aria-hidden="true"></i>
@@ -26,11 +32,3 @@
         </button>
     </center>
 </td>
-<td ng-click="$event.stopPropagation();" align="center">
-    <span codenerix-html-compile="row.uuid|codenerix:'copytoclipboard:UUID:UUID copiado al portapapales...':codenerix_inner_element">
-        <span class="fa fa-barcode"></span>
-    </span>
-</td>
-<td ng-click="$event.stopPropagation();" align="center">
-    <span codenerix-html-compile="row.unsubscribe_url|codenerix:'link:blank:onlyicon'">
-</td>

{django_codenerix_email-4.0.20.dist-info → django_codenerix_email-4.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.20
+Version: 4.0.21
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.20.dist-info → django_codenerix_email-4.0.21.dist-info}/RECORD

@@ -1,8 +1,8 @@
-codenerix_email/__init__.py,sha256=NznooP8z0g_kglbIBGRpXa3c7ipFWR0sxUZIt0zQxeU,149
+codenerix_email/__init__.py,sha256=mHUnjHp4HJsUYsr4BO4cUVdpkqNEWSU_cvGu6zN4Jek,149
 codenerix_email/admin.py,sha256=o3b-MaD7xsWeta0yfU9YNeKBmHQIcmHqXmP2t-hrrWc,1208
 codenerix_email/apps.py,sha256=WXqu1XQibDDyCvvQYt2JbTK4GIpW8BNv5DCbRJS2mmk,149
-codenerix_email/forms.py,sha256=n-UrVPI7NMXNImEdJ4uB0HWHEvBNv71YKZ_RPLW4FSg,4075
-codenerix_email/models.py,sha256=LSMScSZquMFgNM3zke9BZKwXm41qJ3B4aR8CapSUrtQ,20138
+codenerix_email/forms.py,sha256=oVI58ZfDPr2aoA41xPS8yeU5H_JsYXwiEzWVMMnxM7A,4187
+codenerix_email/models.py,sha256=SimsoQ1g0f-woPlUTnEEo1ejjkSn8QL3ACKHWx876RU,20442
 codenerix_email/urls.py,sha256=QYrSJdhCp2PLrcfv_Y7X4OzxqQ0Q2-z7ObDPE-_WLdw,2595
 codenerix_email/urls_frontend.py,sha256=DG5WS_fGQJC9sezNebPwG-E_WtUWy3Kwz4VUxh82xuc,873
 codenerix_email/views.py,sha256=Bx990LC04HOdytHJoO_T0z0R_u6qm6I2Q9bXtnmf5vw,4822
@@ -28,6 +28,7 @@ codenerix_email/migrations/0009_emailmessage_opened_emailmessage_uuid.py,sha256=
 codenerix_email/migrations/0010_emailmessage_content_subtype_and_more.py,sha256=Zy9OwxcQCPoVdemJRlotfpGVyTLuzNkCNQYfoEVnvB0,1001
 codenerix_email/migrations/0011_alter_emailmessage_content_subtype_and_more.py,sha256=Ki38KPngeeTIhrki57OXEwCB5P7JnI1Hv58dwRYLO7w,957
 codenerix_email/migrations/0012_emailmessage_unsubscribe_url.py,sha256=tPQt1W2LJcXMvt_ecB-2npu7wQ-Og29M99ZJjukYnWA,501
+codenerix_email/migrations/0013_emailmessage_headers.py,sha256=1T0lryajjfXhnMgU-aqJUW-CKDvVe6zLrYu_FygcFE4,441
 codenerix_email/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codenerix_email/migrations/__pycache__/0001_initial.cpython-310.pyc,sha256=Sm54OKfGHUMvSVgbXiFAe9E2d85HqlLoMEaBEBP53mE,2005
 codenerix_email/migrations/__pycache__/0001_initial.cpython-311.pyc,sha256=mOTNcz_iff63bExW7wNyR_HXU-e8ON-Au03YpCL_cCw,3682
@@ -67,13 +68,14 @@ codenerix_email/migrations/__pycache__/0010_emailmessage_content_subtype_and_mor
 codenerix_email/migrations/__pycache__/0010_emailmessage_opened_emailmessage_uuid_and_more.cpython-311.pyc,sha256=ZoBI5fyc5vTdGSejQl5953krxh_BXl17tuft5ZmdH6U,3104
 codenerix_email/migrations/__pycache__/0011_alter_emailmessage_content_subtype_and_more.cpython-311.pyc,sha256=rWr5NdYUVeF71WxMUPIzUN67Ua6fhWWjci5dAG7mpRg,1195
 codenerix_email/migrations/__pycache__/0012_emailmessage_unsubscribe_url.cpython-311.pyc,sha256=NghZueCAhFtAwmKhkYzICGMX0uv44-VA5xhHCPp_O-M,936
+codenerix_email/migrations/__pycache__/0013_emailmessage_headers.cpython-311.pyc,sha256=-fFwK7UWVLCbaVh3ej4EQbee44wVC3hBezdgW875ncg,891
 codenerix_email/migrations/__pycache__/__init__.cpython-310.pyc,sha256=PdaaABMdLCzCMnJmxaylT_jnLb8l7rr6n5C4CGDX37A,151
 codenerix_email/migrations/__pycache__/__init__.cpython-311.pyc,sha256=RbbUUEhcJ_eAVNFAdNbkjv60hyF7BsnNOlti5xplQsY,195
 codenerix_email/migrations/__pycache__/__init__.cpython-35.pyc,sha256=2g70xiMW6oJNkIpRM-0Dr5h7AUac-3xyCXPONxp9BBw,147
 codenerix_email/migrations/__pycache__/__init__.cpython-39.pyc,sha256=qNj2NH0YvoWPnCKxkVZPsEFsbM05y7t1njMskNISdVQ,168
-codenerix_email/static/codenerix_email/partials/emailmessages_rows.html,sha256=e-57Lh_Ozh8uX8nx98vE0OSqFwi1CvcdMApTDUfa8lw,2142
-django_codenerix_email-4.0.20.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
-django_codenerix_email-4.0.20.dist-info/METADATA,sha256=yqB25aU80ttOXaFDL5wGK0bqez6yXVSdwrpVERVn9jQ,2640
-django_codenerix_email-4.0.20.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-django_codenerix_email-4.0.20.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
-django_codenerix_email-4.0.20.dist-info/RECORD,,
+codenerix_email/static/codenerix_email/partials/emailmessages_rows.html,sha256=U0YDiFe-JaHri0VFv84jNbpbjgQXX0BVkg66FQybanw,2135
+django_codenerix_email-4.0.21.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
+django_codenerix_email-4.0.21.dist-info/METADATA,sha256=3HETrOQFuUHbDtuKDhM3c3glgvau3e99bXh7aigbKcc,2640
+django_codenerix_email-4.0.21.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+django_codenerix_email-4.0.21.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
+django_codenerix_email-4.0.21.dist-info/RECORD,,