From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 3 Feb 2016 23:03:44 +0000 (+0100)
Subject: fix url pk
X-Git-Tag: 1.1~141
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f4dd5e4ebfe2485d24dfcf8f11f597c2b9726855;p=teleforma.git

fix url pk
---

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 1e1c1cde..2a449819 100644
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -58,7 +58,7 @@ urlpatterns = patterns('',
     # (r'^accounts/register0/$', RegistrationView.as_view(), {'form_class':CustomRegistrationForm}),
     url(r'^accounts/register/$', UserAddView.as_view(), name="teleforma-register"),
     url(r'^accounts/complete/$', UserCompleteView.as_view(), name="teleforma-register-complete"),
-    url(r'^accounts/register/(?P<username>.*)/download/$', RegistrationPDFViewDowload.as_view(),
+    url(r'^accounts/register/(?P<pk>.*)/download/$', RegistrationPDFViewDowload.as_view(),
                                                     name="teleforma-registration-download"),
 
     url(r'^captcha/', include('captcha.urls')),
diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 5130795e..005347df 100644
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -405,11 +405,10 @@ class UserAddView(CreateWithInlinesView):
 
     def forms_valid(self, form, inlines):
         messages.info(self.request, _("You have successfully register your account."))
-        username = get_unique_username(form.cleaned_data['first_name'], form.cleaned_data['last_name'])
-        form.cleaned_data['username'] = username
-        self.user = form.save()
-        self.user.is_active = False
-        self.user.save()
+        user = form.save()
+        user.username = get_unique_username(user.first_name, user.last_name)
+        user.is_active = False
+        user.save()
         return super(UserAddView, self).forms_valid(form, inlines)
 
 
@@ -432,7 +431,8 @@ class RegistrationPDFView(PDFTemplateResponseMixin, DetailView):
 
     def get_context_data(self, **kwargs):
         context = super(RegistrationPDFView, self).get_context_data(**kwargs)
-        user = User.objects.get(username=kwargs['username'])
+        user = User.objects.get(pk=kwargs['pk'])
+        user = self.get_object()
         student = user.student.all()[0]
         if student.training and not student.trainings:
             student.trainings.add(student.training)