Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 

-fixed
This commit is contained in:
denise 2012-04-16 15:51:05 -04:00
parent a7fb8ea3f2
commit 479e112317
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -333,6 +333,7 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction()
{
$range = Application_Model_Schedule::GetPlayOrderRange();
$show = Application_Model_Show::GetCurrentShow();
/* Convert all UTC times to localtime before sending back to user. */
if (isset($range["previous"])){
@ -371,6 +372,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->switch_status = $switch_status;
$this->view->entries = $range;
$this->view->show_name = $show[0]["name"];
}
public function removeGroupAction()

11
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -8,6 +8,8 @@ var nextSong = null;
var currentShow = new Array();
var nextShow = new Array();
var showName = null;
var currentElem;
var serverUpdateInterval = 5000;
@ -149,9 +151,13 @@ function updatePlaybar(){
$('#current').text(currentSong.name+",");
}else{
if (master_dj_on_air) {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>");
if (showName) {
$('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Master Stream</span>");
} else {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>");
}
} else if (live_dj_on_air) {
$('#current').html("Current: <span style='color:red; font-weight:bold'>"+currentShow.name+"</span>");
$('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Live Stream</span>");
} else {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
}
@ -352,6 +358,7 @@ function getScheduleFromServer(){
parseItems(data.entries);
parseSourceStatus(data.source_status);
parseSwitchStatus(data.switch_status);
showName = data.show_name;
}, error:function(jqXHR, textStatus, errorThrown){}});
setTimeout(getScheduleFromServer, serverUpdateInterval);
}