ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated merge with ssh://openslides.org/openslides

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-11-14 21:58:16 +01:00
commit 470684b199
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/application/views.py
View File

@ -34,7 +34,7 @@ from openslides.utils.utils import template, permission_required, \
from openslides.utils.pdf import print_application, print_application_poll from openslides.utils.pdf import print_application, print_application_poll
from openslides.system.api import config_get from openslides.system.api import config_get
from openslides.participant.api import gen_username from openslides.participant.api import gen_username, gen_password
@permission_required('application.can_see_application') @permission_required('application.can_see_application')
@template('application/overview.html') @template('application/overview.html')
@ -492,6 +492,8 @@ def application_import(request):
profile.committee = '' profile.committee = ''
profile.gender = 'none' profile.gender = 'none'
profile.type = 'guest' profile.type = 'guest'
profile.firstpassword = gen_password()
profile.user.set_password(profile.firstpassword)
profile.save() profile.save()
users_generated += 1 users_generated += 1
# create / modify the application # create / modify the application

3
openslides/participant/views.py
View File

@ -322,7 +322,6 @@ def user_import(request):
user.last_name = last_name user.last_name = last_name
user.first_name = first_name user.first_name = first_name
user.username = gen_username(first_name, last_name) user.username = gen_username(first_name, last_name)
#user.set_password("%s%s" % (user.first_name, user.last_name))
#user.email = email #user.email = email
user.save() user.save()
profile = Profile() profile = Profile()
@ -331,6 +330,8 @@ def user_import(request):
profile.group = group profile.group = group
profile.type = type profile.type = type
profile.committee = committee profile.committee = committee
profile.firstpassword = gen_password()
profile.user.set_password(profile.firstpassword)
profile.save() profile.save()
if type == 'delegate': if type == 'delegate':