github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-22 14:13:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

made several changes mentioned in review

Browse source
This commit is contained in:
herby2212 2023-10-07 21:37:49 +02:00
commit b540d891db
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/interfaces/default/graphs.html
View file

@ -326,7 +326,8 @@
'Live TV': '#19A0D7', 'Live TV': '#19A0D7',
'Direct Play': '#E5A00D', 'Direct Play': '#E5A00D',
'Direct Stream': '#FFFFFF', 'Direct Stream': '#FFFFFF',
'Transcode': '#F06464' 'Transcode': '#F06464',
'Max. Concurrent Streams': '#1014FC'
}; };
var series_colors = []; var series_colors = [];
$.each(data_series, function(index, series) { $.each(data_series, function(index, series) {

4
plexpy/graphs.py
View file

@ -22,7 +22,6 @@ from future.builtins import object
import arrow import arrow
import datetime import datetime
import itertools
import plexpy import plexpy
if plexpy.PYTHON2: if plexpy.PYTHON2:
import common import common
@ -1265,12 +1264,11 @@ class Graphs(object):
return output return output
def _make_user_cond(self, user_id, cond_prefix=None): def _make_user_cond(self, user_id, cond_prefix='AND'):
""" """
Expects user_id to be a comma-separated list of ints. Expects user_id to be a comma-separated list of ints.
""" """
user_cond = '' user_cond = ''
cond_prefix = 'AND' if cond_prefix is None else cond_prefix
if session.get_session_user_id() and user_id and user_id != str(session.get_session_user_id()): if session.get_session_user_id() and user_id and user_id != str(session.get_session_user_id()):
user_cond = cond_prefix + ' session_history.user_id = %s ' % session.get_session_user_id() user_cond = cond_prefix + ' session_history.user_id = %s ' % session.get_session_user_id()

3
plexpy/webserve.py
View file

@ -2571,7 +2571,8 @@ class WebInterface(object):
"series": "series":
[{"name": "Direct Play", "data": [...]} [{"name": "Direct Play", "data": [...]}
{"name": "Direct Stream", "data": [...]}, {"name": "Direct Stream", "data": [...]},
{"name": "Transcode", "data": [...]} {"name": "Transcode", "data": [...]},
{"name": "Max. Concurrent Streams", "data": [...]}
] ]
} }
``` ```