From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 4 Feb 2016 00:24:45 +0000 (+0100)
Subject: fix url and order
X-Git-Tag: 1.1~119
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=85e2acbaf5f0f557d77a4ad63753a7d740787fad;p=teleforma.git

fix url and order
---

diff --git a/teleforma/forms.py b/teleforma/forms.py
index 229acbab..3d529af3 100644
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -19,7 +19,7 @@ class UserForm(ModelForm):
 
     class Meta:
         model = User
-        fields = ['last_name', 'first_name', 'email', ]
+        fields = ['first_name', 'last_name', 'email', ]
 
 RegistrationForm.base_fields.update(UserForm.base_fields)
 
diff --git a/teleforma/templates/registration/registration_pdf.html b/teleforma/templates/registration/registration_pdf.html
index 0a22bf7b..b76352ac 100644
--- a/teleforma/templates/registration/registration_pdf.html
+++ b/teleforma/templates/registration/registration_pdf.html
@@ -33,8 +33,8 @@
 <div id="content">
 
    <table class="table1">
-      <tr><td class="bold">{% trans "Last name" %} : </td><td>{{ student.user.last_name|upper }}</td></tr>
       <tr><td class="bold">{% trans "First name" %} : </td><td>{{ student.user.first_name|upper }}</td></tr>
+      <tr><td class="bold">{% trans "Last name" %} : </td><td>{{ student.user.last_name|upper }}</td></tr>
       <tr><td class="bold">{% trans "Address" %} : </td><td>{{ profile.address }} {{ profile.postal_code }} {{ profile.city }} {{ profile.country }}</td></tr>
       <tr><td class="bold">{% trans "Telephone" %} : </td><td>{{ profile.telephone }}</td></tr>
       <tr><td class="bold">{% trans "E-mail" %} : </td><td>{{ student.user.email }}</td></tr>
diff --git a/teleforma/urls.py b/teleforma/urls.py
index 5fd2713c..93d1b7a1 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/(?P<username>.*)/$', UserCompleteView.as_view(), name="teleforma-register-complete"),
-    url(r'^accounts/register/(?P<pk>.*)/download/$', RegistrationPDFViewDownload.as_view(), name="teleforma-registration-download"),
+    url(r'^accounts/register/(?P<username>.*)/download/$', RegistrationPDFViewDownload.as_view(), name="teleforma-registration-download"),
     url(r'^accounts/register/(?P<username>.*)/view/$', RegistrationPDFView.as_view(), name="teleforma-registration-view"),
 
     url(r'^captcha/', include('captcha.urls')),