anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass audio_decision to history tables

Browse Source
This commit is contained in:
Jonathan Wong
2015-09-27 10:26:35 -07:00
parent dcb7486fd6
commit 7327be1ff8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/interfaces/default/js/tables/history_table.js
View File

@@ -104,9 +104,8 @@ history_table_options = {
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['audio_decision'] === 'direct play') { } 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>';
} else {
$(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>');
} }
}, },
"width": "15%", "width": "15%",

2
plexpy/datafactory.py
View File

@@ -60,6 +60,7 @@ class DataFactory(object):
'session_history.user', 'session_history.user',
'session_history_metadata.media_type', 'session_history_metadata.media_type',
'session_history_media_info.video_decision', 'session_history_media_info.video_decision',
'session_history_media_info.audio_decision',
'session_history.user_id as user_id' 'session_history.user_id as user_id'
] ]
try: try:
@@ -118,6 +119,7 @@ class DataFactory(object):
"user": item["user"], "user": item["user"],
"media_type": item["media_type"], "media_type": item["media_type"],
"video_decision": item["video_decision"], "video_decision": item["video_decision"],
"audio_decision": item["audio_decision"],
"user_id": item["user_id"] "user_id": item["user_id"]
} }