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

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

Browse source
This commit is contained in:
denise 2012-10-22 16:37:19 -04:00
commit 9ddd54ec12
5 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

8
airtime_mvc/application/models/ShowInstance.php
View file

@ -679,9 +679,13 @@ SQL;
':p_end' => $p_end->format("Y-m-d G:i:s"))
, 'all');
return $counts;
$real_counts = array();
foreach ($counts as $c) {
$real_counts[$c['instance_id']] = $c['instance_count'];
}
return $real_counts;
}
}
public function showEmpty()
{