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

Fix Users list not sorting alphabetically

Browse source
This commit is contained in:
JonnyWong16 2016-01-18 19:55:10 -08:00
parent 4a5e38dc1e
commit 717530fff7
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plexpy/users.py
View file

@ -27,8 +27,8 @@ class Users(object):
custom_where = ['users.deleted_user', 0] custom_where = ['users.deleted_user', 0]
columns = ['users.user_id', columns = ['users.user_id',
'users.username', '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
'users.friendly_name', THEN users.username ELSE users.friendly_name END) AS friendly_name',
'users.thumb AS user_thumb', 'users.thumb AS user_thumb',
'users.custom_avatar_url AS custom_thumb', 'users.custom_avatar_url AS custom_thumb',
'COUNT(session_history.id) AS plays', 'COUNT(session_history.id) AS plays',
@ -73,11 +73,6 @@ class Users(object):
rows = [] rows = []
for item in users: for item in users:
if item['friendly_name']:
friendly_name = item['friendly_name']
else:
friendly_name = item['username']
if item['media_type'] == 'episode' and item['parent_thumb']: if item['media_type'] == 'episode' and item['parent_thumb']:
thumb = item['parent_thumb'] thumb = item['parent_thumb']
elif item['media_type'] == 'episode': elif item['media_type'] == 'episode':
@ -96,8 +91,7 @@ class Users(object):
platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']) platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
row = {'user_id': item['user_id'], row = {'user_id': item['user_id'],
'username': item['username'], 'friendly_name': item['friendly_name'],
'friendly_name': friendly_name,
'user_thumb': user_thumb, 'user_thumb': user_thumb,
'plays': item['plays'], 'plays': item['plays'],
'last_seen': item['last_seen'], 'last_seen': item['last_seen'],