diff --git a/src/communication/models.py b/src/communication/models.py index 77cbf92..a49c088 100644 --- a/src/communication/models.py +++ b/src/communication/models.py @@ -3,7 +3,9 @@ from django.db import models from django.contrib.auth.models import User from datetime import datetime -class Message(models.Model): +from base.models import Markdownizable + +class Message(Markdownizable): """Représente un message échangé entre deux utilisateurs. Attributes: diff --git a/src/people/forms.py b/src/people/forms.py index 19e520f..f3dd4c8 100644 --- a/src/people/forms.py +++ b/src/people/forms.py @@ -12,7 +12,7 @@ from .models import ( class AccidentForm(forms.ModelForm): class Meta: model = Accident - fields = ("gymnast", "educative", "date", "information") + fields = ("gymnast", "educative", "date", "content") widgets = { "date": forms.DateInput( attrs={ @@ -22,7 +22,7 @@ class AccidentForm(forms.ModelForm): ), "gymnast": forms.HiddenInput(), "educative": forms.HiddenInput(), - "information": forms.Textarea( + "content": forms.Textarea( attrs={ "class": "form-control", "placeholder": "Informations about accident: context (why, where, …), consequencies, …", @@ -72,7 +72,7 @@ class GymnastForm(forms.ModelForm): "active", "orientation", "picture", - "information", + "content", ) widgets = { "id": forms.HiddenInput(), @@ -99,7 +99,7 @@ class GymnastForm(forms.ModelForm): ), "orientation": forms.Select(attrs={"class": "form-control"}), "picture": forms.Select(attrs={"class": "form-control"}), - "information": forms.Textarea( + "content": forms.Textarea( attrs={ "class": "form-control", "placeholder": "Informations about the gymnast.", diff --git a/src/planning/admin.py b/src/planning/admin.py index 071e96f..f2ebb75 100644 --- a/src/planning/admin.py +++ b/src/planning/admin.py @@ -133,9 +133,9 @@ class CourseAdmin(admin.ModelAdmin): class UnavailabilityAdmin(admin.ModelAdmin): model = Unavailability - list_display = ("datebegin", "dateend", "information") + list_display = ("datebegin", "dateend", "content") ordering = ("datebegin", "dateend") - search_fields = ("information",) + search_fields = ("content",) filter_horizontal = ("course",) diff --git a/src/planning/forms.py b/src/planning/forms.py index c291708..9d2efb4 100644 --- a/src/planning/forms.py +++ b/src/planning/forms.py @@ -10,7 +10,7 @@ from .models import Unavailability, Event, PlanningLine class UnavailabilityForm(forms.ModelForm): class Meta: model = Unavailability - fields = ("datebegin", "dateend", "information") + fields = ("datebegin", "dateend", "content") widgets = { "datebegin": forms.TextInput( attrs={ @@ -28,7 +28,7 @@ class UnavailabilityForm(forms.ModelForm): "placeholder": date.today().strftime("%d/%m/%Y"), } ), - "information": forms.Textarea( + "content": forms.Textarea( attrs={ "class": "form-control", "placeholder": "Informations about unavailability: context (why, where, …), …", @@ -49,7 +49,7 @@ class EventForm(forms.ModelForm): "dateend", "place", "eventtype", - "information", + "content", ) # , 'gymnasts' widgets = { "place": forms.HiddenInput(), @@ -71,7 +71,7 @@ class EventForm(forms.ModelForm): "placeholder": date.today().strftime("%Y-%m-%d 18:00"), } ), - "information": forms.Textarea( + "content": forms.Textarea( attrs={ "class": "form-control", "placeholder": "Informations about unavailability: context (why, where, …), …", @@ -102,7 +102,7 @@ class PlanningLineForm(forms.ModelForm): class Meta: model = PlanningLine - fields = ("gymnast", "date", "order", "todo", "information") + fields = ("gymnast", "date", "order", "todo", "content") widgets = { "gymnast": forms.HiddenInput(), "date": forms.TextInput( @@ -115,7 +115,7 @@ class PlanningLineForm(forms.ModelForm): ), "order": forms.TextInput(attrs={"class": "form-control col-sm-5"}), "todo": forms.TextInput(attrs={"class": "form-control col-sm-5"}), - "information": forms.Textarea( + "content": forms.Textarea( attrs={ "class": "form-control", "placeholder": "Informations about unavailability: context (why, where, …), …",