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

Merge branch '2.5.x' into 2.5.x-saas

Browse source
This commit is contained in:
Albert Santoni 2014-01-31 13:21:33 -05:00
commit c7c2d37b30
35 changed files with 2876 additions and 1657 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/models/Scheduler.php
View file

@ -761,10 +761,14 @@ class Application_Model_Scheduler
$file['fadein'] = Application_Common_DateHelper::secondsToPlaylistTime($file['fadein']);
$file['fadeout'] = Application_Common_DateHelper::secondsToPlaylistTime($file['fadeout']);
//array that stores the cc_file ids so we can update the is_scheduled flag
$fileIds = array();
switch ($file["type"]) {
case 0:
$fileId = $file["id"];
$streamId = "null";
$fileIds[] = $fileId;
break;
case 1:
$streamId = $file["id"];
@ -832,11 +836,7 @@ class Application_Model_Scheduler
}
};
}
// update is_scheduled flag for each cc_file
$fileIds = array();
foreach ($filesToInsert as &$file) {
$fileIds[] = $file["id"];
}
$selectCriteria = new Criteria();
$selectCriteria->add(CcFilesPeer::ID, $fileIds, Criteria::IN);
$selectCriteria->addAnd(CcFilesPeer::IS_SCHEDULED, false);