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

Merge branch 'airtime-2.0.x' into devel

Browse source
This commit is contained in:
James 2012-01-17 14:48:04 -05:00
commit 087d893a60
8 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/application/models/Show.php
View file

@ -298,9 +298,11 @@ class Application_Model_Show {
$showId = $this->getId();
$sql = "SELECT starts FROM cc_show_instances "
."WHERE show_id = $showId AND rebroadcast = 1 "
."WHERE instance_id = (SELECT id FROM cc_show_instances WHERE show_id = $showId ORDER BY starts LIMIT 1) AND rebroadcast = 1 "
."ORDER BY starts";
Logging::log($sql);
$rebroadcasts = $CC_DBC->GetAll($sql);
$rebroadcastsLocal = array();
@ -415,8 +417,7 @@ class Application_Model_Show {
public function deleteAllInstances(){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
$showId = $this->getId();
$sql = "DELETE FROM cc_show_instances"
@ -433,8 +434,7 @@ class Application_Model_Show {
public function deleteAllRebroadcasts(){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
$showId = $this->getId();
$sql = "DELETE FROM cc_show_instances"
@ -457,8 +457,7 @@ class Application_Model_Show {
public function removeAllInstancesFromDate($p_date=null){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
if(is_null($p_date)) {
$date = new Application_Model_DateHelper;
@ -490,8 +489,7 @@ class Application_Model_Show {
public function removeAllInstancesBeforeDate($p_date){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
$showId = $this->getId();
$sql = "DELETE FROM cc_show_instances "

7
airtime_mvc/application/models/ShowInstance.php
View file

@ -494,7 +494,12 @@ class Application_Model_ShowInstance {
}
}
else {
$show->delete();
if ($this->isRebroadcast()) {
$this->_showInstance->delete();
}
else {
$show->delete();
}
}
}