Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-2703: orange progress bar is playing when there is not content

Browse source 
-fix it so that previous and future shows are ignored as well.
This commit is contained in:
martin 2011-08-19 15:45:07 -04:00
parent 13f7a73850
commit 7859783ccb
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/models/Dashboard.php
View file

@ -23,10 +23,14 @@ class Application_Model_Dashboard
} }
} else { } else {
if (count($row) == 0){ if (count($row) == 0){
if ($showInstance->isRecorded()){
//last item is a show instance //last item is a show instance
return array("name"=>$showInstance->getName(), return array("name"=>$showInstance->getName(),
"starts"=>$showInstance->getShowStart(), "starts"=>$showInstance->getShowStart(),
"ends"=>$showInstance->getShowEnd()); "ends"=>$showInstance->getShowEnd());
} else {
return null;
}
} else { } else {
//return the one that started later. //return the one that started later.
if ($row[0]["starts"] >= $showInstance->getShowStart()){ if ($row[0]["starts"] >= $showInstance->getShowStart()){
@ -107,10 +111,14 @@ class Application_Model_Dashboard
} }
} else { } else {
if (count($row) == 0){ if (count($row) == 0){
if ($showInstance->isRecorded()){
//last item is a show instance //last item is a show instance
return array("name"=>$showInstance->getName(), return array("name"=>$showInstance->getName(),
"starts"=>$showInstance->getShowStart(), "starts"=>$showInstance->getShowStart(),
"ends"=>$showInstance->getShowEnd()); "ends"=>$showInstance->getShowEnd());
} else {
return null;
}
} else { } else {
//return the one that starts sooner. //return the one that starts sooner.