django-codenerix-email 4.0.10__py2.py3-none-any.whl → 4.0.12__py2.py3-none-any.whl

codenerix_email/__init__.py

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

codenerix_email/forms.py

@@ -36,9 +36,18 @@ class EmailTemplateForm(GenModelForm):
             (
                 _("Details"),
                 12,
-                ["cid", 3],
-                ["efrom", 9],
-            )
+                (
+                    None,
+                    3,
+                    ["cid", 12],
+                    ["content_subtype", 12],
+                ),
+                (
+                    None,
+                    9,
+                    ["efrom", 9],
+                ),
+            ),
         ]
 
     @staticmethod
@@ -81,20 +90,26 @@ class EmailMessageForm(GenModelForm):
                 _("Details"),
                 6,
                 ["uuid", 3],
+                ["created", 3],
+                ["updated", 3],
                 ["efrom", 3],
                 ["eto", 3],
                 ["subject", 3],
-                ["priority", 3],
+                ["opened", 3],
+            ),
+            (
+                _("System"),
+                6,
                 ["sending", 3],
                 ["sent", 3],
                 ["error", 3],
                 ["retries", 3],
-                ["opened", 3],
+                ["priority", 3],
                 ["log", 3],
             ),
             (
                 _("Body"),
-                6,
+                12,
                 ["body", 3],
             ),
         ]

codenerix_email/management/commands/send_emails.py

@@ -70,29 +70,58 @@ class Command(BaseCommand, Debugger):
             default=False,
             help="Clear the sending status to all the Queue",
         )
+        # Named (optional) arguments
+        parser.add_argument(
+            "--verbose",
+            action="store_true",
+            dest="verbose",
+            default=False,
+            help="Enable verbose mode",
+        )
+        # Named (optional) arguments
+        parser.add_argument(
+            "--now",
+            action="store_true",
+            dest="now",
+            default=False,
+            help="Send now, do not wait the retry time",
+        )
+        # Named (optional) arguments
+        parser.add_argument(
+            "--all",
+            action="store_true",
+            dest="all",
+            default=False,
+            help="Send all, do not do on buckets",
+        )
 
     def handle(self, *args, **options):
 
+        # Get user configuration
+        daemon = bool(options["daemon"] or options["d"])
+        clear = bool(options["clear"] or options["c"])
+        bucket_size = getattr(settings, "CLIENT_EMAIL_BUCKETS", 10)
+        verbose = bool(options.get("verbose", False))
+        sendnow = bool(options.get("now", False))
+        doall = bool(options.get("all", False))
+
         # Autoconfigure Debugger
         self.set_name("CODENERIX-EMAIL")
         self.set_debug()
 
-        # Get user configuration
-        daemon = bool(options["daemon"] or options["d"])
-        clear = bool(options["clear"] or options["c"])
-        BUCKET_SIZE = getattr(settings, "CLIENT_EMAIL_BUCKETS", 10)
-        if daemon:
-            self.debug(
-                "Starting command in DAEMON mode with a queue of {} emails".format(
-                    BUCKET_SIZE
-                ),
-                color="cyan",
-            )
-        else:
-            self.debug(
-                "Starting a queue of {} emails".format(BUCKET_SIZE),
-                color="blue",
-            )
+        # Daemon
+        if verbose:
+            if daemon:
+                self.debug(
+                    "Starting command in DAEMON mode with a "
+                    f"queue of {bucket_size} emails",
+                    color="cyan",
+                )
+            else:
+                self.debug(
+                    "Starting a queue of {} emails".format(bucket_size),
+                    color="blue",
+                )
 
         # In if requested set sending status for all the list to False
         if clear:
@@ -110,8 +139,20 @@ class Command(BaseCommand, Debugger):
                 sent=False,
                 sending=False,
                 error=False,
-                next_retry__lte=timezone.now(),
-            ).order_by("priority", "next_retry")[0 : BUCKET_SIZE + 1]
+            )
+
+            # If we do not have to send now we have to wait for the next retry
+            if not sendnow:
+                emails = emails.filter(
+                    next_retry__lte=timezone.now(),
+                )
+
+            # Order emails by priority and next retry
+            emails = emails.order_by("priority", "next_retry")
+
+            # Send in buckets if we are not doing them all
+            if not doall:
+                emails = emails[0 : bucket_size + 1]
 
             # Check if there are emails to process
             if emails:
@@ -126,20 +167,22 @@ class Command(BaseCommand, Debugger):
 
                 # For each email
                 for email in emails:
-                    self.debug(
-                        "Sending to {}".format(email.eto),
-                        color="white",
-                        tail=False,
-                    )
-
-                    # Check if we have connection
-                    if not connection:
+                    if verbose:
                         self.debug(
-                            " - Connecting",
-                            color="yellow",
-                            head=False,
+                            "Sending to {}".format(email.eto),
+                            color="white",
                             tail=False,
                         )
+
+                    # Check if we have connection
+                    if not connection:
+                        if verbose:
+                            self.debug(
+                                " - Connecting",
+                                color="yellow",
+                                head=False,
+                                tail=False,
+                            )
                         connection = email.connect()
 
                     # Send the email
@@ -154,20 +197,26 @@ class Command(BaseCommand, Debugger):
                             email.log = error
                         email.save()
                         self.error(error)
-                    if email.sent:
-                        self.debug(" -> SENT", color="green", head=False)
-                    else:
-                        self.debug(
-                            " -> ERROR", color="red", head=False, tail=False
-                        )
-                        self.debug(
-                            " ({} retries left)".format(
-                                getattr(settings, "CLIENT_EMAIL_RETRIES", 10)
-                                - email.retries
-                            ),
-                            color="cyan",
-                            head=False,
-                        )
+                    if verbose:
+                        if email.sent:
+                            self.debug(" -> SENT", color="green", head=False)
+                        else:
+                            self.debug(
+                                " -> ERROR",
+                                color="red",
+                                head=False,
+                                tail=False,
+                            )
+                            self.debug(
+                                " ({} retries left)".format(
+                                    getattr(
+                                        settings, "CLIENT_EMAIL_RETRIES", 10
+                                    )
+                                    - email.retries
+                                ),
+                                color="cyan",
+                                head=False,
+                            )
 
                 # Delete all that have been sent
                 if not getattr(settings, "CLIENT_EMAIL_HISTORY", True):
@@ -184,7 +233,7 @@ class Command(BaseCommand, Debugger):
                     self.debug("Exited by user request!", color="green")
                     break
 
-            else:
+            elif verbose:
                 # No emails to send
                 self.debug(
                     "No emails to be sent at this moment in the queue!",

codenerix_email/migrations/0010_emailmessage_content_subtype_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.0.6 on 2024-06-04 10:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("codenerix_email", "0009_emailmessage_opened_emailmessage_uuid"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="emailmessage",
+            name="content_subtype",
+            field=models.CharField(
+                blank=True,
+                choices=[("plain", "Plain"), ("html", "HTML")],
+                default="html",
+                max_length=256,
+                verbose_name="Content Subtype",
+            ),
+        ),
+        migrations.AddField(
+            model_name="emailtemplate",
+            name="content_subtype",
+            field=models.CharField(
+                blank=True,
+                choices=[("plain", "Plain"), ("html", "HTML")],
+                default="html",
+                max_length=256,
+                verbose_name="Content Subtype",
+            ),
+        ),
+    ]

codenerix_email/migrations/0011_alter_emailmessage_content_subtype_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.0.6 on 2024-06-04 11:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("codenerix_email", "0010_emailmessage_content_subtype_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="emailmessage",
+            name="content_subtype",
+            field=models.CharField(
+                choices=[("plain", "Plain"), ("html", "HTML Web")],
+                default="html",
+                max_length=256,
+                verbose_name="Content Subtype",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="emailtemplate",
+            name="content_subtype",
+            field=models.CharField(
+                choices=[("plain", "Plain"), ("html", "HTML Web")],
+                default="html",
+                max_length=256,
+                verbose_name="Content Subtype",
+            ),
+        ),
+    ]

codenerix_email/models.py

@@ -17,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
+# type: ignore
 
 import re
 import ssl
@@ -29,14 +31,22 @@ from django.db import models
 from django.template import Context, Template
 from django.core.exceptions import ValidationError
 from django.conf import settings
+from django.db.models import Q
 
-from codenerix.models import CodenerixModel  # type: ignore
+from codenerix.models import CodenerixModel
 from codenerix_lib.debugger import Debugger
-from codenerix.lib.genmail import (  # type: ignore # noqa: N817
+from codenerix.lib.genmail import (  # noqa: N817
     EmailMessage as EM,
     get_connection,
 )
-from codenerix.fields import WysiwygAngularField  # type: ignore
+from codenerix.fields import WysiwygAngularField
+
+CONTENT_SUBTYPE_PLAIN = "plain"
+CONTENT_SUBTYPE_HTML = "html"
+CONTENT_SUBTYPES = (
+    (CONTENT_SUBTYPE_PLAIN, _("Plain")),
+    (CONTENT_SUBTYPE_HTML, _("HTML Web")),
+)
 
 
 class EmailMessage(CodenerixModel, Debugger):
@@ -74,24 +84,78 @@ class EmailMessage(CodenerixModel, Debugger):
     opened = models.DateTimeField(
         _("Opened"), null=True, blank=True, default=None
     )
+    content_subtype = models.CharField(
+        _("Content Subtype"),
+        max_length=256,
+        choices=CONTENT_SUBTYPES,
+        blank=False,
+        null=False,
+        default=CONTENT_SUBTYPE_HTML,
+    )
 
     def __fields__(self, info):
         fields = []
-        fields.append(("sending", None, 100))
-        fields.append(("error", None, 100))
-        fields.append(("sent", _("Send"), 100))
-        fields.append(("priority", _("Priority"), 100))
-        fields.append(("uuid", _("UUID"), 100))
-        fields.append(("created", _("Created"), 100))
-        fields.append(("opened", _("Opened"), 100))
-        fields.append(("efrom", _("From"), 100))
-        fields.append(("eto", _("To"), 100))
-        fields.append(("subject", _("Subject"), 100))
-        fields.append(("retries", _("Retries"), 100))
-        fields.append(("next_retry", _("Next retry"), 100))
-        fields.append(("pk", _("ID"), 100))
+        fields.append(("sending", None))
+        fields.append(("error", None))
+        fields.append(("sent", _("Send")))
+        fields.append(("priority", _("Priority")))
+        fields.append(("updated", _("Updated")))
+        fields.append(("opened", _("Opened")))
+        fields.append(("efrom", _("From")))
+        fields.append(("eto", _("To")))
+        fields.append(("subject", _("Subject")))
+        fields.append(("retries", _("Retries")))
+        fields.append(("next_retry", _("Next retry")))
+        fields.append(("pk", _("ID")))
+        fields.append(("content_subtype", _("Content Subtype")))
+        fields.append(("uuid", _("UUID")))
         return fields
 
+    def __searchQ__(self, info, search):  # noqa: N802
+        answer = super().__searchQ__(info, search)
+        answer["uuid"] = Q(uuid__icontains=search)
+        answer["priority"] = Q(priority=search)
+        answer["efrom"] = Q(efrom__icontains=search)
+        answer["eto"] = Q(eto__icontains=search)
+        answer["retries"] = Q(retries=search)
+        answer["pk"] = Q(pk=search)
+        return answer
+
+    def __searchF__(self, info):  # noqa: N802
+        def mailstatus(x):
+            if x == "D":
+                return Q(error=False, sent=True)
+            elif x == "P":
+                return Q(error=False, sent=False, sending=False)
+            elif x == "S":
+                return Q(error=False, sent=False, sending=True)
+            elif x == "E":
+                return Q(error=True)
+            else:
+                return Q()
+
+        mailoptions = [
+            ("D", _("Sent")),  # Sent - Done
+            ("P", _("Pending")),  # Pending - Pending
+            ("S", _("Sending")),  # Sending - Sending
+            ("E", _("Error")),  # Error - Error
+        ]
+
+        return {
+            "sent": (_("Sent"), lambda x: mailstatus(x), mailoptions),
+            "uuid": (_("UUID"), lambda x: Q(uuid__icontains=x), "input"),
+            "priority": (_("Priority"), lambda x: Q(priority=x), "input"),
+            "opened": (
+                _("Opened"),
+                lambda x: ~Q(opened__isnull=x),
+                [(True, _("Yes")), (False, _("No"))],
+            ),
+            "efrom": (_("From"), lambda x: Q(efrom__icontains=x), "input"),
+            "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"),
+        }
+
     def __unicode__(self):
         return "{} ({})".format(self.eto, self.pk)
 
@@ -100,9 +164,63 @@ class EmailMessage(CodenerixModel, Debugger):
             self.opened = timezone.now()
             self.save()
 
-    def connect(self, legacy=False):
+    @classmethod
+    def process_queue(
+        cls, connection=None, legacy=False, silent=True, debug=False
+    ):
+        """
+        This method will process all the emails in the queue
+        """
+
+        # Process queue
+        emails = cls.objects.filter(
+            sent=False, error=False, next_retry__lte=timezone.now()
+        )
+
+        # Do we have to send emails
+        if emails.count():
+
+            # Get connection if not connected yet
+            if connection is None:
+
+                # Connect
+                connection = cls.internal_connect(legacy)
+
+            # Configure them as sending
+            emails.update(sending=True)
+
+            # Send them
+            for email in emails.order_by("priority"):
+                try:
+                    email.send(
+                        connection=connection,
+                        legacy=legacy,
+                        silent=silent,
+                        debug=debug,
+                    )
+                except Exception as e:
+
+                    # Los the error into this email
+                    if email.log is None:
+                        email.log = ""
+                    email.log += f"Error: {e}\n"
+                    email.sending = False
+                    email.save()
+                    email.warning(f"Error at EmailMessage<{{email.pk}}>: {e}")
+
+                    # Set all emails to not sending, since we are stopping now
+                    emails.update(sending=False)
+
+                    # Re-raise the exception
+                    raise
+
+                emails.update(sending=False)
+
+    @classmethod
+    def internal_connect(cls, legacy=False):
         """
-        This class will return a connection instance, you can disconnect it with connection.close()
+        This class will return a connection instance, you can disconnect it
+        with connection.close()
         """
 
         if not legacy:
@@ -119,15 +237,29 @@ class EmailMessage(CodenerixModel, Debugger):
             use_tls = settings.EMAIL_USE_TLS
 
         # Remember last connection data
-        self.__connect_info = {"host": host, "port": port, "use_tls": use_tls}
+        connect_info = {
+            "host": host,
+            "port": port,
+            "use_tls": use_tls,
+            "legacy": legacy,
+        }
         # Get connection
-        return get_connection(
-            host=host,
-            port=port,
-            username=username,
-            password=password,
-            use_tls=use_tls,
+        return (
+            get_connection(
+                host=host,
+                port=port,
+                username=username,
+                password=password,
+                use_tls=use_tls,
+            ),
+            connect_info,
+        )
+
+    def connect(self, legacy=False):
+        (connection, self.__connect_info) = EmailMessage.internal_connect(
+            legacy
         )
+        return connection
 
     def send(
         self,
@@ -135,7 +267,7 @@ class EmailMessage(CodenerixModel, Debugger):
         legacy=False,
         silent=True,
         debug=False,
-        content_subtype="plain",
+        content_subtype=None,
     ):
 
         # Autoconfigure Debugger
@@ -143,6 +275,16 @@ class EmailMessage(CodenerixModel, Debugger):
             self.set_name("EmailMessage")
             self.set_debug()
 
+        # Warn about subtype
+        if content_subtype:
+            self.warning(
+                _(
+                    "Programming ERROR: You are using content_subtype, this "
+                    "value has been DEPRECATED and will be remove in future "
+                    "versions."
+                )
+            )
+
         # Get connection if not connected yet
         if connection is None:
             # Connect
@@ -155,6 +297,7 @@ class EmailMessage(CodenerixModel, Debugger):
                 self.set_name("EmailMessage->{}".format(self.eto))
 
             # Manually open the connection
+            error = None
             try:
                 connection.open()
             except (
@@ -163,8 +306,6 @@ class EmailMessage(CodenerixModel, Debugger):
                 TimeoutError,
             ) as e:
                 connection = None
-                if self.log is None:
-                    self.log = ""
                 exceptiontxt = str(type(e)).split(".")[-1].split("'")[0]
                 ci = getattr(self, "__connect_info", {})
                 error = "{}: {} [HOST={}:{} TLS={}]\n".format(
@@ -175,12 +316,14 @@ class EmailMessage(CodenerixModel, Debugger):
                     ci.get("use_tls", "-"),
                 )
                 self.warning(error)
-                self.log += error
-                # We will not retry anymore
+                if self.log is None:
+                    self.log = ""
+                self.log += f"{error}\n"
+                # We will not retry anymore (for now)
                 self.sending = False
                 # We make lower this email's priority
                 self.priority += 1
-                # Set new retry
+                # Set we just made a new retry
                 self.retries += 1
                 self.next_retry = timezone.now() + timezone.timedelta(
                     seconds=getattr(
@@ -204,7 +347,7 @@ class EmailMessage(CodenerixModel, Debugger):
                     [self.eto],
                     connection=connection,
                 )
-                email.content_subtype = content_subtype
+                email.content_subtype = self.content_subtype
                 for at in self.attachments.all():
                     with open(at.path) as f:
                         email.attach(at.filename, f.read(), at.mime)
@@ -212,6 +355,7 @@ class EmailMessage(CodenerixModel, Debugger):
                 # send list emails
                 retries = 1
                 while retries + 1:
+                    error = None
                     try:
                         if connection.send_messages([email]):
                             # We are done
@@ -219,27 +363,46 @@ class EmailMessage(CodenerixModel, Debugger):
                             self.sending = False
                             break
                     except ssl.SSLError as e:
-                        error = "SSLError: {}\n".format(e)
+                        error = f"SSLError: {e}\n"
                         self.warning(error)
-                        self.log += error
+                        if self.log is None:
+                            self.log = ""
+                        self.log += f"{error}\n"
                     except smtplib.SMTPServerDisconnected as e:
-                        error = "SMTPServerDisconnected: {}\n".format(e)
-                        self.warning(error)
-                        self.log += error
+                        error = f"SMTPServerDisconnected: {e}\n"
+                        if self.log is None:
+                            self.log = ""
+                        self.log += f"{error}\n"
+                        try:
+                            connection.open()
+                            error = None
+                        except (
+                            smtplib.SMTPAuthenticationError,
+                            OSError,
+                            TimeoutError,
+                        ) as e:
+                            self.warning(error)
+                            error = f"SMTPServerReconnect: {e}\n"
+                            self.warning(error)
+                            if self.log is None:
+                                self.log = ""
+                            self.log += f"{error}\n"
                     except smtplib.SMTPException as e:
-                        error = "SMTPException: {}\n".format(e)
+                        error = f"SMTPException: {e}\n"
                         self.warning(error)
-                        self.log += error
+                        if self.log is None:
+                            self.log = ""
+                        self.log += f"{error}\n"
                     finally:
                         # One chance less
                         retries -= 1
                         # Check if this is the last try
                         if not retries:
-                            # We will not retry anymore
+                            # We will not retry anymore (fow now)
                             self.sending = False
                             # We make lower this email's priority
                             self.priority += 1
-                            # Set new retry
+                            # Set we just made a new retry
                             self.retries += 1
                             self.next_retry = (
                                 timezone.now()
@@ -293,12 +456,21 @@ class EmailTemplate(CodenerixModel):
         _("CID"), unique=True, max_length=30, blank=False, null=False
     )
     efrom = models.TextField(_("From"), blank=True, null=False)
+    content_subtype = models.CharField(
+        _("Content Subtype"),
+        max_length=256,
+        choices=CONTENT_SUBTYPES,
+        blank=False,
+        null=False,
+        default=CONTENT_SUBTYPE_HTML,
+    )
 
     def __fields__(self, info):
         fields = []
         fields.append(("pk", _("PK"), 100))
         fields.append(("cid", _("CID"), 100))
         fields.append(("efrom", _("From"), 100))
+        fields.append(("content_subtype", _("Content Subtype"), 100))
         return fields
 
     def __str__(self):
@@ -313,7 +485,8 @@ class EmailTemplate(CodenerixModel):
         Usages:
             EmailTemplate.get('PACO', ctx) => EmailMessage(): le falta el eto
             > cid: PACO
-            EmailTemplate.get(pk='PACO', context=ctx) => EmailMessage(): le falta el eto
+            EmailTemplate.get(pk='PACO', context=ctx) => EmailMessage(): le
+            falta el eto
             > pk: PACO    (we don't have CID)
         """
         if cid:
@@ -337,6 +510,7 @@ class EmailTemplate(CodenerixModel):
         )
         e.body = Template(getattr(self, lang).body).render(Context(context))
         e.efrom = Template(self.efrom).render(Context(context))
+        e.content_subtype = self.content_subtype
         return e
 
     def clean(self):
@@ -345,7 +519,8 @@ class EmailTemplate(CodenerixModel):
             if len(re.findall(r"[A-Za-z0-9]+", self.cid)) != 1:
                 raise ValidationError(
                     _(
-                        "CID can contains only number and letters with no spaces"
+                        "CID can contains only number and letters with "
+                        "no spaces"
                     )
                 )
 
@@ -378,8 +553,10 @@ for info in MODELS:
     field = info[0]
     model = info[1]
     for lang_code in settings.LANGUAGES_DATABASES:
-        query = "class {}Text{}(GenText):\n".format(model, lang_code)
-        query += "  {} = models.OneToOneField({}, on_delete=models.CASCADE, blank=False, null=False, related_name='{}')\n".format(
-            field, model, lang_code.lower()
+        query = f"class {model}Text{lang_code}(GenText):\n"
+        query += (
+            f"  {field} = models.OneToOneField({model}, "
+            f"on_delete=models.CASCADE, blank=False, null=False, "
+            f"related_name='{lang_code.lower()}')\n"
         )
         exec(query)

codenerix_email/static/codenerix_email/partials/emailmessages_rows.html

@@ -1,18 +1,29 @@
 <td>
-    <span class='fa fa-refresh fa-spin fa-fw text-info' ng-if='!row.error && row.sending' alt='{{data.meta.gentranslate.sending}}...' title='{{data.meta.gentranslate.sending}}...'></span>
-    <span class='fa fa-envelope-o text-success' ng-if='!row.error && !row.sending && row.sent' alt='{{data.meta.gentranslate.sent}}' title='{{data.meta.gentranslate.sent}}'></span>
-    <span class='fa fa-envelope-open-o' ng-if='!row.error && !row.sending && !row.sent' alt='{{data.meta.gentranslate.waiting}}' title='{{data.meta.gentranslate.waiting}}'></span>
-    <span ng-if='row.error' alt='{{data.meta.gentranslate.notsent}}' title='{{data.meta.gentranslate.notsent}}' codenerix-html-compile="false|codenerix"></span>
+    <center>
+        <span class='fa fa-refresh fa-spin fa-fw text-info' ng-if='!row.error && row.sending' alt='{{data.meta.gentranslate.sending}}...' title='{{data.meta.gentranslate.sending}}...'></span>
+        <span class='fa fa-envelope-o text-success' ng-if='!row.error && !row.sending && row.sent' alt='{{data.meta.gentranslate.sent}}' title='{{data.meta.gentranslate.sent}}'></span>
+        <span class='fa fa-envelope-open-o' ng-if='!row.error && !row.sending && !row.sent' alt='{{data.meta.gentranslate.waiting}}' title='{{data.meta.gentranslate.waiting}}'></span>
+        <span ng-if='row.error' alt='{{data.meta.gentranslate.notsent}}' title='{{data.meta.gentranslate.notsent}}' codenerix-html-compile="false|codenerix"></span>
+    </center>
 </td>
-<td>{{row.priority|codenerix}}</td>
-<td>{{row.uuid|codenerix}}</td>
-<td class="text-nowrap">{{row.created|codenerix}}</td>
+<td><center>{{row.priority|codenerix}}</center></td>
+<td class="text-nowrap">{{row.updated|codenerix}}</td>
 <td>
     <span title="{{row.opened}}" codenerix-html-compile="row.opened|codenerix:'bool'"><span>
 </td>
 <td>{{row.efrom|codenerix}}</td>
 <td>{{row.eto|codenerix}}</td>
 <td>{{row.subject|codenerix}}</td>
-<td>{{row.retries|codenerix}}</td>
+<td><center>{{row.retries|codenerix}}</center></td>
 <td class="text-nowrap">{{row.next_retry|codenerix}}</td>
-<td>{{row.pk|codenerix}}</td>
+<td><center>{{row.pk|codenerix}}</center></td>
+<td>
+    <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>
+            <i ng-show="row.content_subtype=='html'" class="fa fa-code" aria-hidden="true"></i>
+            <i ng-hide="(row.content_subtype=='plain') || (row.content_subtype=='html')"class="fa fa-question-circle-o" aria-hidden="true"></i>
+        </button>
+    </center>
+</td>
+<td>{{row.uuid|codenerix}}</td>

codenerix_email/views.py

@@ -144,7 +144,8 @@ class EmailTemplateDelete(GenDelete):
 class EmailMessageList(GenList):
     model = EmailMessage
     show_details = True
-    default_ordering = ["-created"]
+    search_filter_button = True
+    default_ordering = ["-updated"]
     static_partial_row = "codenerix_email/partials/emailmessages_rows.html"
     gentranslate = {
         "sending": _("Sending"),

{django_codenerix_email-4.0.10.dist-info → django_codenerix_email-4.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.10
+Version: 4.0.12
 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.10.dist-info → django_codenerix_email-4.0.12.dist-info}/RECORD

@@ -1,19 +1,21 @@
-codenerix_email/__init__.py,sha256=2zJS-yDMitL9qpjQIh8y7gnRJtFviLBEH65RPfd2Fzc,149
+codenerix_email/__init__.py,sha256=7EbI8PxpPMEHM1uvXlStjZZSYxcLFgwcqtW3UD6OadM,149
 codenerix_email/admin.py,sha256=o3b-MaD7xsWeta0yfU9YNeKBmHQIcmHqXmP2t-hrrWc,1208
 codenerix_email/apps.py,sha256=WXqu1XQibDDyCvvQYt2JbTK4GIpW8BNv5DCbRJS2mmk,149
-codenerix_email/forms.py,sha256=6qEOBoNIVidS5w-CdCKIHLU5kkFerG02BqrkCWRu7Hs,3706
-codenerix_email/models.py,sha256=UVfMzN1yGztdS7y-_W1CUL6Xu5P9e1D72OYGl6Lr9OM,13286
+codenerix_email/forms.py,sha256=n-UrVPI7NMXNImEdJ4uB0HWHEvBNv71YKZ_RPLW4FSg,4075
+codenerix_email/models.py,sha256=Y9Du0C9W3_h9Di9n0HphY15smzG1wFccMasHYjnbP0k,19063
 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=T6qAFeD_PTlX-6eZuSFP68s80vrFne0ZkZjTbHhbyV8,4758
+codenerix_email/views.py,sha256=PyOWSAblRLzbYAzzTCZTR-VapKzf7-jpxnJ9TwX2t7Y,4790
 codenerix_email/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codenerix_email/management/__pycache__/__init__.cpython-310.pyc,sha256=7vUcYbg6ZpWdEhb0hq2FSiwMtpBWIjMTv8H8rcgtiOY,179
 codenerix_email/management/__pycache__/__init__.cpython-311.pyc,sha256=OtPcxwWjtJcDfDWQCWutxYIIwHerLtkPPyMcEFOpdMM,195
 codenerix_email/management/__pycache__/__init__.cpython-35.pyc,sha256=sBoEWs6zdI0al-7t1deW9SE_Ln2RNDl2LyIiOO9gfRA,160
 codenerix_email/management/__pycache__/__init__.cpython-39.pyc,sha256=uPXklfliVd3b8pLOJQT9ZeKcqmJMrGychvt68BsPulY,168
 codenerix_email/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-codenerix_email/management/commands/send_emails.py,sha256=eVRWGQ67E6XT3Dqq_q4WAs50i-kKeXRtqY4oOV_hy7Y,6290
+codenerix_email/management/commands/send_emails.py,sha256=hotzGEkuDILwKgZgHFOaSCeAZDIyoPcM7VDs3Z-5Vvg,7950
 codenerix_email/management/commands/test_email.py,sha256=riV1zhSVY8t9EhzV2IXkIkTnhFyvAGGYpwGiwEKx7NM,1655
+codenerix_email/management/commands/__pycache__/__init__.cpython-311.pyc,sha256=yiqmtIhQMYXWx7g7XT-mvQNgGu_X2ymasWvVxIqPsBE,211
+codenerix_email/management/commands/__pycache__/send_emails.cpython-311.pyc,sha256=xh2ontFVtLWHZOoVf1YJrNbBNPtIyV2KQEk5Bf6mY_c,6884
 codenerix_email/migrations/0001_initial.py,sha256=Rp6noz8vjtGi4f4qc2w_es_VV9PmO7WvVfv666mu9xE,3511
 codenerix_email/migrations/0002_auto_20170502_1043.py,sha256=-zoc4RuZFXJA1Fw8ECCVqAg-PYfku3yxdtYNyXPI3LM,2369
 codenerix_email/migrations/0003_auto_20170921_1206.py,sha256=ncVdyZJ616vQpllGdaPbFS0n9qKfDP-TuVA5HkbPf4I,656
@@ -23,6 +25,8 @@ codenerix_email/migrations/0006_emailmessage_error.py,sha256=qEZ-GQDufZDTdiH5w4c
 codenerix_email/migrations/0007_emailmessage_next_retry.py,sha256=aSOTLqoYFo2V78r5dn-HmEs-loutCoqS-BF97_Vy_sU,602
 codenerix_email/migrations/0008_auto_20171201_0928.py,sha256=cqlgf9IfNgU-IJey073K1FT-pp6i2gXDgLnU-xrFir0,731
 codenerix_email/migrations/0009_emailmessage_opened_emailmessage_uuid.py,sha256=jt3AzNCHM-hTuV9FP1FTzYMJnsl_GNQ74jv5n9_adi4,1219
+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/__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
@@ -58,14 +62,16 @@ codenerix_email/migrations/__pycache__/0008_auto_20171201_0928.cpython-35.pyc,sh
 codenerix_email/migrations/__pycache__/0008_auto_20171201_0928.cpython-39.pyc,sha256=YQE0mlPzQ-MXjrPcJVK74O_rg6hsSnKJfTlqttYYlPU,794
 codenerix_email/migrations/__pycache__/0009_delete_emailtemplatetexten.cpython-311.pyc,sha256=9BM5UKxi6pwZbBpULueb5BLCuMUIYGh6-r0PDvTE2LQ,733
 codenerix_email/migrations/__pycache__/0009_emailmessage_opened_emailmessage_uuid.cpython-311.pyc,sha256=clSN_yEmdCuAm8QFGKCa8W35Emj7aADpHjHEqIOLdfo,1860
+codenerix_email/migrations/__pycache__/0010_emailmessage_content_subtype_and_more.cpython-311.pyc,sha256=MTWH-MJZqJeT42E-nnRYs2H0vwnBN5kGCk1-TOF6YpE,1201
 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__/__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=AvSL9B5r6obY792JExRbFn8NM7i0h-FCGGUhFgemMwk,1170
-django_codenerix_email-4.0.10.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
-django_codenerix_email-4.0.10.dist-info/METADATA,sha256=umpHyIFZbxRNmTS-WxOYpi8tH1vXzs7M8J7fVV8YyyE,2640
-django_codenerix_email-4.0.10.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-django_codenerix_email-4.0.10.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
-django_codenerix_email-4.0.10.dist-info/RECORD,,
+codenerix_email/static/codenerix_email/partials/emailmessages_rows.html,sha256=2KjE_YZ91OAFZuHteQeQ2r2vOBeZmwmnJQ4L-bH4B50,1735
+django_codenerix_email-4.0.12.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
+django_codenerix_email-4.0.12.dist-info/METADATA,sha256=vxgtpJQ43fdEoUhzSjk1kNjzn9OQo2K0X06JM64vv9Q,2640
+django_codenerix_email-4.0.12.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+django_codenerix_email-4.0.12.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
+django_codenerix_email-4.0.12.dist-info/RECORD,,