Wrap methods returning raw HTML in mark_safe (#1382)

* initial

* renamed to something more sensible

* Add a required checkbox to the CfP proposal submission page. The checkbox content is not stored in the database, but submission will fail unless checked.

* added test to verify that speakers do have to agree to the speaker release agreement

* initial

* renamed to something more sensible

* Added a template simple_tag to list a user tickets for the current conference. Uses functionality already implemented.

* Added documentation

* Added a template simple_tag to list a user tickets for the current conference. Uses functionality already implemented.

* Upgraded jquery-flot to v0.8.3 for compatibility with django admin jquery version - v3.5.1

* Wrapping methods using the old allow_tags attribute in mark_safe, making them compatible with later versions of Django

Author: fpierfed

assopy/admin.py

@@ -392,6 +392,7 @@ def changelist_view(self, request, extra_context=None):
             request.META['QUERY_STRING'] = request.GET.urlencode()
         return super(CouponAdmin,self).changelist_view(request, extra_context=extra_context)
 
+    @mark_safe
     def _user(self, o):
         if not o.user:
             return ''
@@ -552,6 +553,7 @@ def _order(self, o):
         return mark_safe('<a href="%s">%s</a>' % (url, order.code))
     _order.admin_order_field = 'order'
 
+    @mark_safe
     def _user(self, o):
         u = o.order.user.user
         name = '%s %s' % (u.first_name, u.last_name)

conference/admin.py

@@ -83,11 +83,13 @@ def __init__(self, *args, **kw):
 class ConferenceAdmin(admin.ModelAdmin):
     list_display = ('code', 'name', '_schedule_view', '_attendee_stats')
 
+    @mark_safe
     def _schedule_view(self, o):
         u = reverse('admin:conference-conference-schedule', args=(o.code,))
         return '<a href="%s">schedule</a>' % u
     _schedule_view.allow_tags = True
 
+    @mark_safe
     def _attendee_stats(self, o):
         u = reverse('admin:conference-ticket-stats', args=(o.code,))
         return '<a href="%s">Attendee Stats</a>' % u
@@ -480,6 +482,7 @@ def stats_list(self, request):
             },
         )
 
+    @mark_safe
     def _user(self, o):
         if o.user.attendeeprofile:
             p = reverse('profiles:profile', kwargs={'profile_slug': o.user.attendeeprofile.slug})
@@ -498,6 +501,7 @@ def _email(self, o):
         return o.user.email
     _user.admin_order_field = 'user__email'
 
+    @mark_safe
     def _avatar(self, o):
         try:
             img = o.user.attendeeprofile.image
@@ -956,6 +960,7 @@ def _ticket(self, o):
         return o.fare.code
     _ticket.admin_order_field = 'fare__code'
 
+    @mark_safe
     def _order(self, obj):
         url = reverse('admin:assopy_order_change',
                       args=(obj.orderitem.order.id,))
@@ -966,6 +971,7 @@ def _order_date(self, o):
         return o.orderitem.order.created
     _order_date.admin_order_field = 'orderitem__order__created'
 
+    @mark_safe
     def _assigned(self, ticket):
         if ticket.p3_conference:
             assigned_to = ticket.p3_conference.assigned_to
@@ -1068,6 +1074,7 @@ def _python_experience(self, o):
         return p3c.python_experience
     _python_experience.admin_order_field = 'p3_conference__python_experience'
 
+    @mark_safe
     def _tagline(self, o):
         try:
             p3c = o.p3_conference

p3/admin.py

@@ -2,6 +2,7 @@
 from django.contrib import admin
 from django.db import models
 from django.forms import TextInput, Textarea
+from django.utils.safestring import mark_safe
 
 from taggit.forms import TagField
 from taggit_labels.widgets import LabelWidget
@@ -21,6 +22,7 @@ class VotoTalkAdmin(admin.ModelAdmin):
     ]
     ordering = ("-talk__conference", "talk")
 
+    @mark_safe
     def _name(self, o):
         url = reverse(
             "profiles:profile", kwargs={"profile_slug": o.user.attendeeprofile.slug}
@@ -50,6 +52,7 @@ class AttendeeProfileAdmin(admin.ModelAdmin):
         "location",
     ]
 
+    @mark_safe
     def _name(self, o):
         url = reverse("profiles:profile", kwargs={"profile_slug": o.slug})
         return '<a href="%s">%s %s</a>' % (
@@ -61,6 +64,7 @@ def _name(self, o):
     _name.allow_tags = True
     _name.admin_order_field = "user__first_name"
 
+    @mark_safe
     def _user(self, o):
         url = reverse("admin:auth_user_change", args=(o.user.id,))
         return '<a href="%s">%s</a>' % (url, o.user.username)
@@ -126,6 +130,7 @@ class TalkAdmin(admin.ModelAdmin):
     def _tags(self, obj):
         return ", ".join(sorted(str(tag) for tag in obj.tags.all()))
 
+    @mark_safe
     def _speakers(self, obj):
         """Warnings – this is de-optimised version of previous cached query,
         however much easier to work with and much easier to debug"""