diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 50696f83..82cac9ae 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -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', diff --git a/plexpy/webserve.py b/plexpy/webserve.py index d0c1c5d9..3ed79246 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -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)