claudep/eds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make url/url_code methods safe

Browse source
This commit is contained in:
Claude Paroz 2018-05-28 10:32:35 +02:00
parent 5dc29dd907
commit eb200de278
6 changed files with 52 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cms/models.py
View file

@ -5,6 +5,7 @@ Created on 17 nov. 2012
"""
from django.db import models
from django.utils.html import format_html
from tinymce import models as tinymce_models
@ -53,7 +54,7 @@ class Domaine(models.Model):
return '{0} - {1}'.format(self.code, self.nom)
def url(self):
return "<a href='/domaine/{0}/'>{1}</a>".format(self.pk, self.__str__())
return format_html('<a href="/domaine/{0}/">{1}</a>', self.pk, str(self))
class Processus(models.Model):
@ -70,7 +71,7 @@ class Processus(models.Model):
return '{0} - {1}'.format(self.code, self.nom)
def url(self):
return "<a href='/processus/{0}'>{1}</a>".format(self.pk, self.__str__())
return format_html('<a href="/processus/{0}/">{1}</a>', self.pk, str(self))
class Module(models.Model):
@ -103,10 +104,10 @@ class Module(models.Model):
return '{0} - {1}'.format(self.code, self.nom)
def url(self):
return "<a href='/module/{0}/'>{1}</a>".format(self.pk, self.__str__())
return format_html('<a href="/module/{0}/">{1}</a>', self.pk, str(self))
def url_code(self):
return "<a href='/module/{0}/' title=\"{2}\">{1}</a>".format(self.pk, self.code, self.nom)
return format_html('<a href="/module/{0}/" title="{2}">{1}</a>', self.pk, self.code, self.nom)
@property
def total_presentiel(self):

4
cms/tests.py
View file

@ -8,7 +8,7 @@ from django.core import mail
from django.test import TestCase, Client
from django.urls import reverse
# Create your tests here.
from cms.models import Domaine, Processus, Module
@ -17,11 +17,9 @@ class PdfTestCase(TestCase):
@classmethod
def setUpTestData(cls):
User.objects.create_superuser('me', 'me@example.org', 'mepassword')
def setUp(self):
self.client = Client()
self.client.login(username='me', password='mepassword')
def test_index(self):