mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-22 06:13:25 -07:00
made several changes mentioned in review
This commit is contained in:
parent
254da125ab
commit
b540d891db
3 changed files with 5 additions and 5 deletions
|
@ -326,7 +326,8 @@
|
|||
'Live TV': '#19A0D7',
|
||||
'Direct Play': '#E5A00D',
|
||||
'Direct Stream': '#FFFFFF',
|
||||
'Transcode': '#F06464'
|
||||
'Transcode': '#F06464',
|
||||
'Max. Concurrent Streams': '#1014FC'
|
||||
};
|
||||
var series_colors = [];
|
||||
$.each(data_series, function(index, series) {
|
||||
|
|
|
@ -22,7 +22,6 @@ from future.builtins import object
|
|||
|
||||
import arrow
|
||||
import datetime
|
||||
import itertools
|
||||
import plexpy
|
||||
if plexpy.PYTHON2:
|
||||
import common
|
||||
|
@ -1265,12 +1264,11 @@ class Graphs(object):
|
|||
|
||||
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.
|
||||
"""
|
||||
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()):
|
||||
user_cond = cond_prefix + ' session_history.user_id = %s ' % session.get_session_user_id()
|
||||
|
|
|
@ -2571,7 +2571,8 @@ class WebInterface(object):
|
|||
"series":
|
||||
[{"name": "Direct Play", "data": [...]}
|
||||
{"name": "Direct Stream", "data": [...]},
|
||||
{"name": "Transcode", "data": [...]}
|
||||
{"name": "Transcode", "data": [...]},
|
||||
{"name": "Max. Concurrent Streams", "data": [...]}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue