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

Another ambiguous column name fix

Browse source
This commit is contained in:
Jonathan Wong 2015-09-16 13:40:47 -07:00
parent 626e7fdf82
commit 060c549259
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/datafactory.py
View file

@ -40,7 +40,7 @@ class DataFactory(object):
SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS duration', SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS duration',
'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter', 'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter',
'session_history.user_id', 'session_history.user_id',
'user', 'session_history.user',
'(CASE WHEN users.friendly_name IS NULL THEN user ELSE users.friendly_name END) as friendly_name', '(CASE WHEN users.friendly_name IS NULL THEN user ELSE users.friendly_name END) as friendly_name',
'player', 'player',
'ip_address', 'ip_address',

4
plexpy/webserve.py
View file

@ -580,9 +580,9 @@ class WebInterface(object):
custom_where=[] custom_where=[]
if user_id: if user_id:
custom_where = [['user_id', user_id]] custom_where = [['session_history.user_id', user_id]]
elif user: elif user:
custom_where = [['user', user]] custom_where = [['session_history.user', user]]
if 'rating_key' in kwargs: if 'rating_key' in kwargs:
rating_key = kwargs.get('rating_key', "") rating_key = kwargs.get('rating_key', "")
custom_where = [['session_history.rating_key', rating_key]] custom_where = [['session_history.rating_key', rating_key]]