CC-5078: Wrong start time if dragging dynamic smart block into a show
This commit is contained in:
parent
0362f24a4e
commit
5ba5864d8c
|
@ -602,6 +602,12 @@ class Application_Model_Scheduler
|
||||||
$nextStartDT = $endTimeDT;
|
$nextStartDT = $endTimeDT;
|
||||||
$pos++;
|
$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
|
}//all files have been inserted/moved
|
||||||
|
|
||||||
// update is_scheduled flag for each cc_file
|
// update is_scheduled flag for each cc_file
|
||||||
|
@ -617,12 +623,6 @@ class Application_Model_Scheduler
|
||||||
$filesToInsert = null;
|
$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) {
|
if ($adjustSched === true) {
|
||||||
$followingSchedItems = CcScheduleQuery::create()
|
$followingSchedItems = CcScheduleQuery::create()
|
||||||
->filterByDBStarts($initalStartDT->format("Y-m-d H:i:s.u"), Criteria::GREATER_EQUAL)
|
->filterByDBStarts($initalStartDT->format("Y-m-d H:i:s.u"), Criteria::GREATER_EQUAL)
|
||||||
|
|
Loading…
Reference in New Issue