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

Merge branch '2.3.x' into devel

This commit is contained in:
denise 2013-01-23 16:31:42 -05:00
parent 2069da64c1 adaab6ba96
commit 7ab7236d5d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Show.php
View File

@ -1798,7 +1798,7 @@ SQL;
$options["show_empty"] = (array_key_exists($show['instance_id'], $options["show_empty"] = (array_key_exists($show['instance_id'],
$content_count)) ? 0 : 1; $content_count)) ? 0 : 1;
$options["show_partial_filled"] = $isFull[$show['instance_id']]; $options["show_partial_filled"] = !$isFull[$show['instance_id']];
$events[] = &self::makeFullCalendarEvent($show, $options, $events[] = &self::makeFullCalendarEvent($show, $options,
$startsDT, $endsDT, $startsEpochStr, $endsEpochStr); $startsDT, $endsDT, $startsEpochStr, $endsEpochStr);

2
airtime_mvc/application/models/ShowInstance.php
View File

@ -688,7 +688,7 @@ SQL;
public static function getIsFull($p_start, $p_end) public static function getIsFull($p_start, $p_end)
{ {
$sql = <<<SQL $sql = <<<SQL
SELECT id, ends-starts < time_filled as filled SELECT id, ends-starts-'00:00:05' < time_filled as filled
from cc_show_instances from cc_show_instances
WHERE ends > :p_start::TIMESTAMP WHERE ends > :p_start::TIMESTAMP
AND starts < :p_end::TIMESTAMP AND starts < :p_end::TIMESTAMP