Merge branch 'Kerl/mark_safe'

This commit is contained in:
Martin Pépin 2016-07-14 00:40:25 +02:00
commit f39ec8633d
2 changed files with 3 additions and 2 deletions

View file

@ -3,10 +3,10 @@ from django.contrib.auth.decorators import login_required
from django.utils.encoding import smart_str
from django.forms.models import modelform_factory
from django.core.files import File
from django.utils.safestring import mark_safe
import os
from partitions.forms import UploadFileForm, UploadMorceauForm
from partitions.models import Partition, PartitionSet
from partitions.decorators import chef_required
@ -156,4 +156,5 @@ def listepart(request, nom, auteur):
form.save()
else:
form = ChefEditForm(instance=p)
infos = mark_safe(p.infos)
return render(request, 'partitions/listepart.html', locals())

View file

@ -20,7 +20,7 @@
{% if p.infos %}
<div>
<h4>Infos utiles</h4>
<p>{{ p.infos }}</p>
<p>{{ infos }}</p>
</div>
{% endif %}
{% endif %}