altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 6 Packages Projects Releases Wiki Activity

Added a None guard for the person merge last_login date comparison. Fixes issue #2562

Browse source 
- Legacy-Id: 15418
This commit is contained in:
Henrik Levkowetz 2018-07-30 16:57:59 +00:00
parent 43133fec1e
commit 0ca9ec769c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/person/views.py
View file

@ -92,7 +92,7 @@ def merge(request):
target = form.cleaned_data.get('target')
if source.user and target.user:
warn_messages.append('WARNING: Both Person records have logins. Be sure to specify the record to keep in the Target field.')
if source.user.last_login > target.user.last_login:
if source.user.last_login and target.user.last_login and source.user.last_login > target.user.last_login:
warn_messages.append('WARNING: The most recently used login is being deleted!')
change_details = handle_users(source, target, check_only=True)
method = 'post'