Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
85a0664972
Binary file not shown.
|
@ -37,6 +37,8 @@ def polls_login(request):
|
||||||
profile = user.userprofile_set.first()
|
profile = user.userprofile_set.first()
|
||||||
if not profile or profile.status == 0:
|
if not profile or profile.status == 0:
|
||||||
return JsonResponse({'status': 'error', 'message': '用户尚未激话'})
|
return JsonResponse({'status': 'error', 'message': '用户尚未激话'})
|
||||||
|
if not profile or profile.admin_status == 0:
|
||||||
|
return JsonResponse({'status': 'error', 'message': '用户已删除,请联系管理员'})
|
||||||
|
|
||||||
u = authenticate(request, username=phone, password=password)
|
u = authenticate(request, username=phone, password=password)
|
||||||
if u is not None:
|
if u is not None:
|
||||||
|
|
Loading…
Reference in New Issue