Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rendered preview in admin. Fixes: #325 #383

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 90 additions & 8 deletions post_office/admin.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
import re

from django import forms
from django.db import models
from django.contrib import admin
from django.conf import settings
from django.conf.urls import re_path
from django.contrib import admin
from django.core.exceptions import ValidationError
from django.core.mail.message import SafeMIMEText
from django.db import models
from django.forms import BaseInlineFormSet
from django.forms.widgets import TextInput
from django.http.response import HttpResponse, HttpResponseNotFound
from django.template import Context, Template
from django.http.response import HttpResponse
from django.http.response import HttpResponseNotFound
from django.template import Context
from django.template import Template
from django.urls import re_path
from django.urls import reverse
from django.utils.html import format_html
from django.utils.text import Truncator
from django.utils.translation import gettext_lazy as _

from . import settings as post_office_settings
from .fields import CommaSeparatedEmailField
from .models import Attachment, Log, Email, EmailTemplate, STATUS
from .models import Attachment
from .models import Email
from .models import EmailTemplate
from .models import Log
from .models import STATUS
from .sanitizer import clean_html


Expand Down Expand Up @@ -249,36 +256,111 @@ def __init__(self, *args, **kwargs):
self.fields['language'].disabled = True


def _create_iframe(src, height):
return format_html('''
<iframe
style="width: 80%; height: {height}px;"
src="{src}">'
sandbox
</iframe>
''', height=height, src=src)


class EmailTemplateInline(admin.StackedInline):
form = EmailTemplateAdminForm
formset = EmailTemplateAdminFormSet
model = EmailTemplate
extra = 0
fields = ('language', 'subject', 'content', 'html_content',)
fields = ('language', 'subject', 'content', 'html_content',
'rendered_content', 'rendered_html_content',)
readonly_fields = ('rendered_content', 'rendered_html_content',)
formfield_overrides = {
models.CharField: {'widget': SubjectField}
}

def rendered_content(self, instance):
if instance.content:
src = '?preview=text&language={}'.format(instance.language)
height = instance.content.count('\n') * 25
return _create_iframe(src, height)
else:
return ''

def rendered_html_content(self, instance):
if instance.html_content:
src = '?preview=text&language={}'.format(instance.language)
return _create_iframe(src, 800)
else:
return ''

def get_max_num(self, request, obj=None, **kwargs):
return len(settings.LANGUAGES)


class EmailTemplateAdmin(admin.ModelAdmin):
form = EmailTemplateAdminForm
list_display = ('name', 'description_shortened', 'subject', 'languages_compact', 'created')
list_display = (
'name', 'description_shortened', 'subject', 'languages_compact',
'created')
search_fields = ('name', 'description', 'subject')
readonly_fields = ('rendered_content', 'rendered_html_content')
fieldsets = [
(None, {
'fields': ('name', 'description'),
}),
(_("Default Content"), {
'fields': ('subject', 'content', 'html_content'),
}),
(_("Preview"), {
'fields': ('example_context', 'rendered_content',
'rendered_html_content'),
}),
]
inlines = (EmailTemplateInline,) if settings.USE_I18N else ()
formfield_overrides = {
models.CharField: {'widget': SubjectField}
}
change_form_template = 'admin/post_office/EmailTemplate/change_form.html'

def change_view(self, request, object_id, form_url='', extra_context=None):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this dedicated preview functionality to a new view?

if request.GET.get('preview'):
instance = self.model.objects.get(id=object_id)
engine = post_office_settings.get_template_engine()

if request.GET.get('language'):
template_instance = instance.translated_templates.filter(
language=request.GET.get('language'),
).first()
else:
template_instance = instance

if request.GET.get('preview') == 'html':
template = engine.from_string(
template_instance.html_content
.replace('inline_image', 'static')
.replace(' post_office ', ' static '))
else:
template = engine.from_string(
'<pre>%s</pre>' % template_instance.content)

return HttpResponse(clean_html(template.render(
instance.example_context)))

return super().change_view(request, object_id, form_url, extra_context)

def rendered_content(self, instance):
if instance.content:
src = '?preview=text'
height = instance.content.count('\n') * 25
return _create_iframe(src, height)
else:
return ''

def rendered_html_content(self, instance):
if instance.html_content:
return _create_iframe('?preview=html', 800)
else:
return ''

def get_queryset(self, request):
return self.model.objects.filter(default_template__isnull=True)
Expand Down
19 changes: 19 additions & 0 deletions post_office/migrations/0012_add_example_context.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 3.2.10 on 2021-12-12 02:17

from django.db import migrations, models
import jsonfield.fields


class Migration(migrations.Migration):

dependencies = [
('post_office', '0011_models_help_text'),
]

operations = [
migrations.AddField(
model_name='emailtemplate',
name='example_context',
field=jsonfield.fields.JSONField(blank=True, null=True, verbose_name='Context'),
),
]
1 change: 1 addition & 0 deletions post_office/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ class EmailTemplate(models.Model):
default='', blank=True)
default_template = models.ForeignKey('self', related_name='translated_templates',
null=True, default=None, verbose_name=_('Default template'), on_delete=models.CASCADE)
example_context = context_field_class(_('Context'), blank=True, null=True)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we adding a new field to the model? Adding a preview to admin shouldn't necessitate adding a new field.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the variable name is self explanatory, but it's to add a context to the rendered preview so all variables can be rendered with a useful value.


objects = EmailTemplateManager()

Expand Down