haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 03:18:23 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1728 from haiwen/clear-token

Browse Source 
update clear token
This commit is contained in:
xiez
2017-08-01 16:35:16 +08:00
committed by GitHub
parent f031cbe74e 259655b6bd
commit 1e03661d2d
6 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
seahub/views/sysadmin.py
View File

@@ -42,7 +42,7 @@ from seahub.invitations.models import Invitation
from seahub.role_permissions.utils import get_available_roles
from seahub.utils import IS_EMAIL_CONFIGURED, string2list, is_valid_username, \
is_pro_version, send_html_email, get_user_traffic_list, get_server_id, \
clear_token, handle_virus_record, get_virus_record_by_id, \
handle_virus_record, get_virus_record_by_id, \
get_virus_record, FILE_AUDIT_ENABLED, get_max_upload_file_size
from seahub.utils.file_size import get_file_size_unit
from seahub.utils.ldap import get_ldap_info
@@ -904,10 +904,10 @@ def user_toggle_status(request, email):
return HttpResponse(json.dumps({'success': True,
'email_sent': email_sent,
}), content_type=content_type)
else:
clear_token(user.email)
return HttpResponse(json.dumps({'success': True}),
content_type=content_type)
except User.DoesNotExist:
return HttpResponse(json.dumps({'success': False}), status=500,
content_type=content_type)
@@ -967,7 +967,6 @@ def user_reset(request, email):
user.set_password(new_password)
user.save()
clear_token(user.username)
if config.FORCE_PASSWORD_CHANGE:
UserOptions.objects.set_force_passwd_change(user.username)