diff --git a/cms/models.py b/cms/models.py index 9982c8f..2f385ec 100644 --- a/cms/models.py +++ b/cms/models.py @@ -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 "{1}".format(self.pk, self.__str__()) + return format_html('{1}', 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 "{1}".format(self.pk, self.__str__()) + return format_html('{1}', 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 "{1}".format(self.pk, self.__str__()) + return format_html('{1}', self.pk, str(self)) def url_code(self): - return "{1}".format(self.pk, self.code, self.nom) + return format_html('{1}', self.pk, self.code, self.nom) @property def total_presentiel(self): diff --git a/cms/tests.py b/cms/tests.py index e21f6cc..ba23a57 100644 --- a/cms/tests.py +++ b/cms/tests.py @@ -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): diff --git a/templates/cms/domaine_detail.html b/templates/cms/domaine_detail.html index 97f82d5..5c84a2d 100644 --- a/templates/cms/domaine_detail.html +++ b/templates/cms/domaine_detail.html @@ -6,7 +6,7 @@

Domaine: {{ object }}

{% for p in object.processus_set.all %} -

Processus: {{ p.url|safe }}

+

Processus: {{ p.url }}

{% for m in p.module_set.all %}
Module: {{ m }}
Compétences visées
diff --git a/templates/cms/index.html b/templates/cms/index.html index 207d0dc..87e6232 100644 --- a/templates/cms/index.html +++ b/templates/cms/index.html @@ -17,9 +17,9 @@ Sem6 - {{ D1.url|safe }} - {{ P01.url|safe }} - {{ M01.url_code|safe }} + {{ D1.url }} + {{ P01.url }} + {{ M01.url_code }}       @@ -27,7 +27,7 @@   - {{ M02.url_code|safe }} + {{ M02.url_code }}       @@ -35,18 +35,18 @@   - {{ P02.url|safe }} + {{ P02.url }}     - {{ M03.url_code|safe }} + {{ M03.url_code }}     - {{ M04.url_code|safe }} + {{ M04.url_code }}       @@ -54,92 +54,92 @@ - {{ D2.url|safe }} - {{ P03.url|safe }} - {{ M05.url_code|safe }} + {{ D2.url }} + {{ P03.url }} + {{ M05.url_code }}   - {{ M06.url_code|safe }} + {{ M06.url_code }}       - {{ P04.url|safe }} + {{ P04.url }}         - {{ M07.url_code|safe }} - {{ M09.url_code|safe }} + {{ M07.url_code }} + {{ M09.url_code }}         - {{ M08.url_code|safe }}{{ M08.url_code }}  - {{ D3.url|safe }} - {{ P05.url|safe }} + {{ D3.url }} + {{ P05.url }}     - {{ M10.url_code|safe }} - {{ M12.url_code|safe }} + {{ M10.url_code }} + {{ M12.url_code }}   - {{ P06.url|safe }} + {{ P06.url }}     - {{ M11.url_code|safe }} + {{ M11.url_code }}     - {{ D4.url|safe }} - {{ P07.url|safe }} + {{ D4.url }} + {{ P07.url }}     - {{ M13.url_code|safe }} + {{ M13.url_code }}   - {{ M14.url_code|safe }} + {{ M14.url_code }}   - {{ D5.url|safe }} - {{ P08.url|safe }} - {{ M15.url_code|safe }} + {{ D5.url }} + {{ P08.url }} + {{ M15.url_code }} - {{ D6.url|safe }} - {{ P09.url|safe }} - {{ M16_1a.url_code|safe }} / {{ M16_1b.url_code|safe }} / {{ M16_1c.url_code|safe }} / {{ M16_1d.url_code|safe }} / {{ M16_1e.url_code|safe }} - {{ M16_2a.url_code|safe }} / {{ M16_2b.url_code|safe }} - {{ M16_3a.url_code|safe }} / {{ M16_3b.url_code|safe }} / {{ M16_3c.url_code|safe }} + {{ D6.url }} + {{ P09.url }} + {{ M16_1a.url_code }} / {{ M16_1b.url_code }} / {{ M16_1c.url_code }} / {{ M16_1d.url_code }} / {{ M16_1e.url_code }} + {{ M16_2a.url_code }} / {{ M16_2b.url_code }} + {{ M16_3a.url_code }} / {{ M16_3b.url_code }} / {{ M16_3c.url_code }} - {{ D7.url|safe }} - {{ P10.url|safe} } - {{ M17_1.url_code|safe }} - {{ M17_2.url_code|safe }} - {{ M17_3.url_code|safe }} + {{ D7.url }} + {{ P10.url }} + {{ M17_1.url_code }} + {{ M17_2.url_code }} + {{ M17_3.url_code }} - {{ D8.url|safe }} - {{ P11.url|safe }} - {{ MACC.url_code|safe }} + {{ D8.url }} + {{ P11.url }} + {{ MACC.url_code }}
diff --git a/templates/cms/module_detail.html b/templates/cms/module_detail.html index 9f66e40..33304f1 100644 --- a/templates/cms/module_detail.html +++ b/templates/cms/module_detail.html @@ -7,11 +7,11 @@ - + - + diff --git a/templates/cms/processus_detail.html b/templates/cms/processus_detail.html index 7ad6c3e..117326f 100644 --- a/templates/cms/processus_detail.html +++ b/templates/cms/processus_detail.html @@ -22,7 +22,7 @@ - + @@ -32,7 +32,7 @@
Domaine{{ object.processus.domaine.url|safe }}{{ object.processus.domaine.url }}
Processus{{ object.processus.url|safe }}{{ object.processus.url }}
Situation emblématique
Domaine{{ object.domaine.url|safe }}{{ object.domaine.url }}
ResponsableModules concernés {% for m in object.module_set.all %} - {{ m.url|safe }}
+ {{ m.url }}
{% endfor %}