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

Fix stream info modal on Users and Libraries pages

Browse source
This commit is contained in:
JonnyWong16 2016-01-22 17:59:20 -08:00
parent af4d0248d9
commit f29d7c8cfb
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
data/interfaces/default/js/tables/users.js
View file

@ -120,14 +120,14 @@ users_list_table_options = {
"createdCell": function (td, cellData, rowData, row, col) { "createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== null && cellData !== '') { if (cellData !== null && cellData !== '') {
var transcode_dec = ''; var transcode_dec = '';
if (rowData['video_decision'] === 'transcode') { if (rowData['video_decision'] === 'transcode' || rowData['audio_decision'] === 'transcode') {
transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>'; transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
} else if (rowData['video_decision'] === 'copy') { } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') {
transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>'; transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>';
} else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') { } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') {
transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>'; transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
} }
$(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>'); $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp;' + cellData + '</div></a></div>');
} else { } else {
$(td).html('n/a'); $(td).html('n/a');
} }

2
plexpy/libraries.py
View file

@ -110,6 +110,7 @@ class Libraries(object):
'library_sections.art', 'library_sections.art',
'COUNT(session_history.id) AS plays', 'COUNT(session_history.id) AS plays',
'MAX(session_history.started) AS last_accessed', 'MAX(session_history.started) AS last_accessed',
'MAX(session_history.id) AS id',
'session_history_metadata.full_title AS last_watched', 'session_history_metadata.full_title AS last_watched',
'session_history_metadata.thumb', 'session_history_metadata.thumb',
'session_history_metadata.parent_thumb', 'session_history_metadata.parent_thumb',
@ -172,6 +173,7 @@ class Libraries(object):
'library_art': item['art'], 'library_art': item['art'],
'plays': item['plays'], 'plays': item['plays'],
'last_accessed': item['last_accessed'], 'last_accessed': item['last_accessed'],
'id': item['id'],
'last_watched': item['last_watched'], 'last_watched': item['last_watched'],
'thumb': thumb, 'thumb': thumb,
'media_type': item['media_type'], 'media_type': item['media_type'],

4
plexpy/users.py
View file

@ -33,6 +33,7 @@ class Users(object):
'users.custom_avatar_url AS custom_thumb', 'users.custom_avatar_url AS custom_thumb',
'COUNT(session_history.id) AS plays', 'COUNT(session_history.id) AS plays',
'MAX(session_history.started) AS last_seen', 'MAX(session_history.started) AS last_seen',
'MAX(session_history.id) AS id',
'session_history_metadata.full_title AS last_watched', 'session_history_metadata.full_title AS last_watched',
'session_history.ip_address', 'session_history.ip_address',
'session_history.platform', 'session_history.platform',
@ -43,6 +44,7 @@ class Users(object):
'session_history_metadata.media_type', 'session_history_metadata.media_type',
'session_history.rating_key', 'session_history.rating_key',
'session_history_media_info.video_decision', 'session_history_media_info.video_decision',
'session_history_media_info.audio_decision',
'users.do_notify as do_notify', 'users.do_notify as do_notify',
'users.keep_history as keep_history' 'users.keep_history as keep_history'
] ]
@ -96,6 +98,7 @@ class Users(object):
'plays': item['plays'], 'plays': item['plays'],
'last_seen': item['last_seen'], 'last_seen': item['last_seen'],
'last_watched': item['last_watched'], 'last_watched': item['last_watched'],
'id': item['id'],
'ip_address': item['ip_address'], 'ip_address': item['ip_address'],
'platform': platform, 'platform': platform,
'player': item['player'], 'player': item['player'],
@ -103,6 +106,7 @@ class Users(object):
'media_type': item['media_type'], 'media_type': item['media_type'],
'rating_key': item['rating_key'], 'rating_key': item['rating_key'],
'video_decision': item['video_decision'], 'video_decision': item['video_decision'],
'audio_decision': item['audio_decision'],
'do_notify': helpers.checked(item['do_notify']), 'do_notify': helpers.checked(item['do_notify']),
'keep_history': helpers.checked(item['keep_history']) 'keep_history': helpers.checked(item['keep_history'])
} }