1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 01:44:13 +00:00

update import users

This commit is contained in:
lian
2017-02-21 18:13:47 +08:00
parent 385a2ef096
commit 86b7925d5f

View File

@@ -1811,15 +1811,14 @@ def batch_add_user(request):
continue continue
try: try:
username = row[0].strip() or '' username = row[0].strip()
password = row[1].strip() or '' password = row[1].strip()
if not is_valid_username(username) or not password:
continue
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
continue continue
if not is_valid_username(username) or password == '':
continue
try: try:
User.objects.get(email=username) User.objects.get(email=username)
except User.DoesNotExist: except User.DoesNotExist:
@@ -1831,47 +1830,34 @@ def batch_add_user(request):
# then update the user's optional info # then update the user's optional info
try: try:
nickname = row[2].strip() or '' nickname = row[2].strip()
if len(nickname) <= 64 and '/' not in nickname: if len(nickname) <= 64 and '/' not in nickname:
Profile.objects.add_or_update(username, nickname, '') Profile.objects.add_or_update(username, nickname, '')
except Exception as e:
logger.error(e)
continue
try: department = row[3].strip()
department = row[3].strip() or ''
if len(department) <= 512: if len(department) <= 512:
DetailedProfile.objects.add_or_update(username, department, '') DetailedProfile.objects.add_or_update(username, department, '')
except Exception as e:
logger.error(e)
continue
try: role = row[4].strip()
role = row[4].strip() or ''
if is_pro_version() and role in get_available_roles(): if is_pro_version() and role in get_available_roles():
User.objects.update_role(username, role) User.objects.update_role(username, role)
except Exception as e:
logger.error(e)
continue
try: space_quota_mb = row[5].strip()
space_quota_mb = row[5].strip() or ''
space_quota_mb = int(space_quota_mb) space_quota_mb = int(space_quota_mb)
if space_quota_mb >= 0: if space_quota_mb >= 0:
space_quota = int(space_quota_mb) * get_file_size_unit('MB') space_quota = int(space_quota_mb) * get_file_size_unit('MB')
seafile_api.set_user_quota(username, space_quota) seafile_api.set_user_quota(username, space_quota)
send_html_email_with_dj_template(
username, dj_template='sysadmin/user_batch_add_email.html',
subject=_(u'You are invited to join %s') % SITE_NAME,
context={
'user': email2nickname(request.user.username),
'email': username,
'password': password,
})
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
continue
send_html_email_with_dj_template(
username, dj_template='sysadmin/user_batch_add_email.html',
subject=_(u'You are invited to join %s') % SITE_NAME,
context={
'user': email2nickname(request.user.username),
'email': username,
'password': password,
})
messages.success(request, _('Import succeeded')) messages.success(request, _('Import succeeded'))
else: else: