fixes for django2

This commit is contained in:
artus
2018-10-11 14:35:31 +02:00
parent c753645193
commit 8fa768cad5
9 changed files with 22 additions and 17 deletions

View File

@@ -76,8 +76,8 @@ class AppelForm(UserNoteForm):
class SignalementForm(UserNoteForm):
nom = forms.CharField(64, required=False)
prenom = forms.CharField(64, required=False)
nom = forms.CharField(max_length=64, required=False)
prenom = forms.CharField(max_length=64, required=False)
age = forms.IntegerField(required=False)
genre = forms.ChoiceField(choices=GENRE_CHOICES)

View File

@@ -2,7 +2,7 @@ import calendar
import datetime
from django.db import models
from django.db.models import Count
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import gettext as _
from utilisateurs.models import Maraudeur
@@ -108,14 +108,14 @@ class Maraude(models.Model):
# Maraudeurs
referent = models.ForeignKey(
"utilisateurs.Maraudeur",
models.CASCADE,
on_delete=models.CASCADE,
verbose_name="Référent",
related_name="references",
default=get_referent_maraude
)
binome = models.ForeignKey(
"utilisateurs.Maraudeur",
models.CASCADE,
on_delete=models.CASCADE,
verbose_name="Binôme",
related_name="maraudes",
limit_choices_to={

View File

@@ -37,7 +37,7 @@ class Appel(Note):
class Signalement(Note):
source = models.ForeignKey("utilisateurs.Organisme")
source = models.ForeignKey("utilisateurs.Organisme", on_delete=models.CASCADE)
def note_labels(self):
return [self.source, self.created_by]

View File

@@ -4,6 +4,8 @@ from django.conf.urls import url
from . import views
app_name = "maraudes"
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name="index"),
url(r'^compte-rendu$', views.redirect_to_current_compterendu, name="cr-link"),