From 83e4d95741e098a065a41d81f0776232b8008583 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 30 Jun 2024 10:32:05 -0500 Subject: [PATCH] fix: don't escape each address for email attempts grid now that we are properly escaping the full cell value, no need --- tailbone/views/email.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tailbone/views/email.py b/tailbone/views/email.py index 22954782..4014c05e 100644 --- a/tailbone/views/email.py +++ b/tailbone/views/email.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -28,14 +28,13 @@ import logging import re import warnings -from rattail import mail -from rattail.db import model -from rattail.config import parse_list +from wuttjamaican.util import parse_list + +from rattail.db.model import EmailAttempt from rattail.util import simple_error import colander from deform import widget as dfwidget -from webhelpers2.html import HTML from tailbone import grids from tailbone.db import Session @@ -85,7 +84,7 @@ class EmailSettingView(MasterView): ] def __init__(self, request): - super(EmailSettingView, self).__init__(request) + super().__init__(request) self.email_handler = self.get_handler() @property @@ -204,7 +203,7 @@ class EmailSettingView(MasterView): return True def configure_form(self, f): - super(EmailSettingView, self).configure_form(f) + super().configure_form(f) profile = f.model_instance['_email'] # key @@ -437,7 +436,7 @@ class EmailPreview(View): """ def __init__(self, request): - super(EmailPreview, self).__init__(request) + super().__init__(request) if hasattr(self, 'get_handler'): warnings.warn("defining a get_handler() method is deprecated; " @@ -520,7 +519,7 @@ class EmailAttemptView(MasterView): """ Master view for email attempts. """ - model_class = model.EmailAttempt + model_class = EmailAttempt route_prefix = 'email_attempts' url_prefix = '/email/attempts' creatable = False @@ -553,7 +552,7 @@ class EmailAttemptView(MasterView): ] def configure_grid(self, g): - super(EmailAttemptView, self).configure_grid(g) + super().configure_grid(g) # sent g.set_sort_defaults('sent', 'desc') @@ -583,13 +582,12 @@ class EmailAttemptView(MasterView): if len(recips) > 2: recips = recips[:2] recips.append('...') - recips = [HTML.escape(r) for r in recips] return ', '.join(recips) return value def configure_form(self, f): - super(EmailAttemptView, self).configure_form(f) + super().configure_form(f) # key f.set_renderer('key', self.render_email_key)