github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-10 23:42:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow "All Users" in graphs for guests

Browse source
This commit is contained in:
JonnyWong16 2016-05-04 12:10:58 -07:00
parent 68d124ff04
commit 3da8cc1e7f
5 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/users.py
View file

@ -599,19 +599,23 @@ class Users(object):
def get_user_names(self, kwargs=None):
monitor_db = database.MonitorDatabase()
user_cond = ''
if session.get_session_user_id():
user_cond = 'AND user_id = %s ' % session.get_session_user_id()
try:
query = 'SELECT user_id, ' \
'(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
THEN users.username ELSE users.friendly_name END) AS friendly_name ' \
'FROM users ' \
'WHERE deleted_user = 0'
'WHERE deleted_user = 0 %s' % user_cond
result = monitor_db.select(query)
except Exception as e:
logger.warn(u"PlexPy Users :: Unable to execute database query for get_user_names: %s." % e)
return None
return result
return session.friendly_name_to_username(result)
def get_tokens(self, user_id=None):
if user_id: