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

Fix ambiguous column names

Browse source
This commit is contained in:
Jonathan Wong 2015-09-16 13:11:38 -07:00
parent fc75232519
commit adc808ac9f
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/datafactory.py
View file

@ -31,7 +31,7 @@ class DataFactory(object):
group_by = ['session_history.reference_id'] if grouping else ['session_history.id']
columns = ['reference_id',
columns = ['session_history.reference_id',
'session_history.id',
'started AS date',
'MIN(started) AS started',

8
plexpy/webserve.py
View file

@ -583,19 +583,19 @@ class WebInterface(object):
custom_where = [['user', user]]
if 'rating_key' in kwargs:
rating_key = kwargs.get('rating_key', "")
custom_where = [['rating_key', rating_key]]
custom_where = [['session_history.rating_key', rating_key]]
if 'parent_rating_key' in kwargs:
rating_key = kwargs.get('parent_rating_key', "")
custom_where = [['parent_rating_key', rating_key]]
custom_where = [['session_history.parent_rating_key', rating_key]]
if 'grandparent_rating_key' in kwargs:
rating_key = kwargs.get('grandparent_rating_key', "")
custom_where = [['grandparent_rating_key', rating_key]]
custom_where = [['session_history.grandparent_rating_key', rating_key]]
if 'start_date' in kwargs:
start_date = kwargs.get('start_date', "")
custom_where = [['strftime("%Y-%m-%d", datetime(date, "unixepoch", "localtime"))', start_date]]
if 'reference_id' in kwargs:
reference_id = kwargs.get('reference_id', "")
custom_where = [['reference_id', reference_id]]
custom_where = [['session_history.reference_id', reference_id]]
data_factory = datafactory.DataFactory()
history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping)