github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 21:03:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/database.py
#	plexpy/version.py
This commit is contained in:
JonnyWong16 2020-04-12 21:35:29 -07:00
commit 3ca4351aeb
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
10 changed files with 116 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plexpy/users.py
View file

@ -698,9 +698,10 @@ class Users(object):
return all(success)
elif str(user_id).isdigit():
database.delete_user_history(user_id=user_id)
delete_success = database.delete_user_history(user_id=user_id)
if purge_only:
return True
return delete_success
else:
logger.info("Tautulli Users :: Deleting user with user_id %s from database."
% user_id)
@ -708,7 +709,7 @@ class Users(object):
monitor_db.action('UPDATE users '
'SET deleted_user = 1, keep_history = 0, do_notify = 0 '
'WHERE user_id = ?', [user_id])
return True
return delete_success
except Exception as e:
logger.warn("Tautulli Users :: Unable to execute database query for delete: %s." % e)