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

Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo

Browse source 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
This commit is contained in:
Martin Konecny 2012-02-28 13:58:10 -05:00
commit 413d669bbf
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/Schedule.php
View file

@ -417,8 +417,7 @@ class Application_Model_Schedule {
* Returns null if nothing found
*/
public static function GetItems($p_currentDateTime, $p_toDateTime)
{
public static function GetItems($p_currentDateTime, $p_toDateTime) {
global $CC_CONFIG, $CC_DBC;
$rows = array();
@ -502,6 +501,7 @@ class Application_Model_Schedule {
$item["cue_out"] = $item["cue_out"] - $diff;
}
$start = Application_Model_Schedule::AirtimeTimeToPypoTime($item["start"]);
$data["media"][$start] = array(
'id' => $storedFile->getGunid(),