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

CC-4080: Calendar -> Cannot create show because there was a repeating show at same time before 

-fixed
This commit is contained in:
denise 2012-08-22 15:22:01 -04:00
parent ef5427d0bc
commit 0071caf94d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/models/Schedule.php
View File

@ -1065,10 +1065,11 @@ SQL;
if ($update) { if ($update) {
$sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]." $sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]."
where ends <= '{$show_end->format('Y-m-d H:i:s')}' where ends <= '{$show_end->format('Y-m-d H:i:s')}'
and id != ".$instanceId. " order by ends"; and modified_instance = false and id != ".$instanceId. " order by ends";
} else { } else {
$sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]." $sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]."
where ends <= '{$show_end->format('Y-m-d H:i:s')}' order by ends"; where ends <= '{$show_end->format('Y-m-d H:i:s')}'
and modified_instance = false order by ends";
} }
$rows = $con->query($sql); $rows = $con->query($sql);