content/models.py

@@ -69,7 +69,7 @@ class Content(models.Model):
     header = MarkdownxField(blank=True, null=True, default='')
     body = MarkdownxField(blank=True, null=True, default='')
     teaser = models.TextField(blank=True, null=True, validators=[MaxLengthValidator(200)])
-    schedule = MarkdownxField(blank=True, null=True, default='')
+    schedule = models.TextField(blank=True, null=True)    
     schedulebutton = models.CharField(db_column='scheduleButton', max_length=255, blank=True, null=True)  # Field name made lowercase.
     optbtn2 = models.CharField(db_column='optBtn2', max_length=127, blank=True, null=True)  # Field name made lowercase.
     opttext2 = models.TextField(db_column='optText2', blank=True, null=True)  # Field name made lowercase.
@@ -119,10 +119,6 @@ class Content(models.Model):
             value = ''
         return mark_safe(value)
 
-    @property
-    def formatted_schedule(self):
-        return mark_safe(markdownify(self.schedule))
-
     @property
     def typefilter(self):
         return self.type

content/templates/contact.html

@@ -20,11 +20,9 @@
     <script>
         $('#captcha').on({
             click: function() {
-                var token = $('input[name="csrfmiddlewaretoken"]')[1].value;
-                $('#csrf').val(token)
+                $('#csrf').val(getCookie('csrftoken'))
                 $('#contact').submit()
             }
         });
     </script>
-    {% csrf_token %}
 {% endblock %}

content/templates/opt.html

@@ -17,6 +17,6 @@
 {% if content.schedule %}
 <div class="schedule">
     <h4>{{content.schedulebutton|default:"Schedule"}}</h4>
-    <p>{{ content.formatted_schedule }}</p>
+    <p>{{ content.schedule|safe|linebreaks }}</p>
 </div>
 {% endif %}

content/views.py

@@ -247,8 +247,7 @@ def redirect_event(request):
         content = get_object_or_404(Content, shortname=shortname)
         return redirect(content.get_absolute_url())
     id = request.GET.get('id')
-    if id:
-        id = re.compile('\d+').findall(id)
+    id = re.compile('\d+').findall(id)
     if id:
         id = id[0]
         content = get_object_or_404(Content, id=id)