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

Merge branch 'master' into CC-2301

Browse source
This commit is contained in:
Naomi 2013-05-02 16:15:58 -04:00
commit 3e320f1e2e
4 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -660,6 +660,12 @@ class Application_Model_Scheduler
$nextStartDT = $endTimeDT;
$pos++;
/* If we are adjusting start and end times for items
* after the insert location, we need to exclude the
* schedule item we just inserted because it has correct
* start and end times*/
$excludeIds[] = $sched->getDbId();
}//all files have been inserted/moved
// update is_scheduled flag for each cc_file
@ -675,12 +681,6 @@ class Application_Model_Scheduler
$filesToInsert = null;
}
/* If we are adjusting start and end times for items
* after the insert location, we need to exclude the
* schedule item we just inserted because it has correct
* start and end times*/
$excludeIds[] = $sched->getDbId();
if ($adjustSched === true) {
$followingSchedItems = CcScheduleQuery::create()
->filterByDBStarts($initalStartDT->format("Y-m-d H:i:s.u"), Criteria::GREATER_EQUAL)

11
airtime_mvc/application/models/airtime/CcShow.php
View file

@ -155,7 +155,14 @@ class CcShow extends BaseCcShow {
*/
public function getCcShowInstancess($criteria = null, PropelPDO $con = null)
{
if(null === $this->collCcShowInstancess || null !== $criteria) {
return CcShowInstancesQuery::create(null, $criteria)
->filterByCcShow($this)
->filterByDbModifiedInstance(false)
->filterByDbEnds(gmdate("Y-m-d H:i:s"), criteria::GREATER_THAN)
->orderByDbId()
->find($con);
/*if(null === $this->collCcShowInstancess || null !== $criteria) {
if ($this->isNew() && null === $this->collCcShowInstancess) {
// return empty collection
$this->initCcShowInstancess();
@ -172,7 +179,7 @@ class CcShow extends BaseCcShow {
$this->collCcShowInstancess = $collCcShowInstancess;
}
}
return $this->collCcShowInstancess;
return $this->collCcShowInstancess;*/
}
public function getInstanceIds() {