From 510cbf83741d0a0b9517639a7b3f2b63bd56e2ff Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Mon, 5 Sep 2011 09:08:12 +0200
Subject: [PATCH] reorder user-import csv data

---
 openslides/participant/templates/participant/import.html | 4 ++--
 openslides/participant/views.py                          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index 146fa3c6e..b9e3e9cd4 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -4,8 +4,8 @@
 {% block content %}
     <h1>Import</h1>
     <p>{% trans 'Select a CSV file to import participants!' %}</p>
-    
-    <p>{% trans '(Required comma separated values: <code>last_name, first_name, email, gender, group, type, committee</code>)' %} </p>
+
+    <p>{% trans '(Required comma separated values: <code>first_name, last_name, gender, group, type, committee</code>)' %} </p>
     <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
         {{ form.as_p }}
         <button type="submit">
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index daada7da3..4c259326c 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -251,13 +251,13 @@ def user_import(request):
             for line in request.FILES['csvfile']:
                 i += 1
                 if i > 0:
-                    (last_name, first_name, email, gender, group, type, committee) = line.strip().split(',')
+                    (first_name, last_name, gender, group, type, committee) = line.strip().split(',')
                     user = User()
                     user.last_name = last_name
                     user.first_name = first_name
                     user.username = gen_username(first_name, last_name)
-                    user.set_password("%s%s" % (user.first_name, user.last_name))
-                    user.email = email
+                    #user.set_password("%s%s" % (user.first_name, user.last_name))
+                    #user.email = email
                     user.save()
                     profile = Profile()
                     profile.user = user