From 8fa768cad5c73f4efb3176be0a0e38847bbe5371 Mon Sep 17 00:00:00 2001 From: artus Date: Thu, 11 Oct 2018 14:35:31 +0200 Subject: [PATCH] fixes for django2 --- maraudes/forms.py | 4 ++-- maraudes/models.py | 6 +++--- maraudes/notes.py | 2 +- maraudes/urls.py | 2 ++ notes/models.py | 3 ++- notes/urls.py | 2 ++ statistiques/urls.py | 2 ++ utilisateurs/urls.py | 2 ++ website/urls.py | 16 ++++++---------- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/maraudes/forms.py b/maraudes/forms.py index 306fdda..bf4d13c 100644 --- a/maraudes/forms.py +++ b/maraudes/forms.py @@ -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) diff --git a/maraudes/models.py b/maraudes/models.py index 6d434c5..b1669aa 100644 --- a/maraudes/models.py +++ b/maraudes/models.py @@ -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={ diff --git a/maraudes/notes.py b/maraudes/notes.py index 48c5e56..be38acc 100644 --- a/maraudes/notes.py +++ b/maraudes/notes.py @@ -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] diff --git a/maraudes/urls.py b/maraudes/urls.py index d9cee6e..d33d765 100644 --- a/maraudes/urls.py +++ b/maraudes/urls.py @@ -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"), diff --git a/notes/models.py b/notes/models.py index 824e2a5..70850db 100644 --- a/notes/models.py +++ b/notes/models.py @@ -104,13 +104,14 @@ class Note(models.Model): sujet = models.ForeignKey( Sujet, + on_delete=models.CASCADE, related_name="notes", - on_delete=models.CASCADE ) text = models.TextField("Texte") created_by = models.ForeignKey( 'utilisateurs.Professionnel', + on_delete=models.SET_NULL, blank=True, null=True ) diff --git a/notes/urls.py b/notes/urls.py index f508b04..6cf9ad0 100644 --- a/notes/urls.py +++ b/notes/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "notes" + urlpatterns = [ url(r'^$', views.IndexView.as_view(), name="index"), url(r'sujets/$', views.SujetListView.as_view(), name="liste-sujet"), diff --git a/statistiques/urls.py b/statistiques/urls.py index 01ef255..c21b880 100644 --- a/statistiques/urls.py +++ b/statistiques/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "statistiques" + urlpatterns = [ url('^$', views.DashboardView.as_view(), name="index"), url('^charts/$', views.TypologieChartsView.as_view(), name="typologie"), diff --git a/utilisateurs/urls.py b/utilisateurs/urls.py index cb1c9e8..d5370aa 100644 --- a/utilisateurs/urls.py +++ b/utilisateurs/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "utilisateurs" + urlpatterns = [ url(r'^$', views.UtilisateurView.as_view(), name="index"), ] diff --git a/website/urls.py b/website/urls.py index a085350..b203af7 100644 --- a/website/urls.py +++ b/website/urls.py @@ -1,23 +1,19 @@ from django.conf.urls import include, url -from django.contrib.auth import views as auth_views +from django.contrib.auth import logout as logout_view from .views import Index, login_view -from maraudes import urls as maraudes_urls -from notes import urls as notes_urls -from utilisateurs import urls as utilisateurs_urls -from statistiques import urls as stats_urls urlpatterns = [ # Authentification url(r'^$', Index.as_view(), name="index"), url(r'^login/$', login_view, name="login"), - url(r'^logout/$', auth_views.logout, { + url(r'^logout/$', logout_view, { 'next_page': 'index', }, name="logout"), # Applications - url(r'^maraudes/', include(maraudes_urls, namespace="maraudes")), - url(r'^notes/', include(notes_urls, namespace="notes")), - url(r'^utilisateurs/', include(utilisateurs_urls, namespace="utilisateurs")), - url(r'^statistiques/', include(stats_urls, namespace="statistiques")), + url(r'^maraudes/', include('maraudes.urls', namespace="maraudes")), + url(r'^notes/', include('notes.urls', namespace="notes")), + url(r'^utilisateurs/', include('utilisateurs.urls', namespace="utilisateurs")), + url(r'^statistiques/', include('statistiques.urls', namespace="statistiques")), ]