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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
denise 2012-09-17 14:53:17 -04:00
commit 1e0595d7ad
16 changed files with 115 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -558,6 +558,7 @@ WHERE st.ends > :startTime1
AND st.starts < :endTime
AND st.playout_status > 0
AND si.ends > :startTime2
AND si.modified_instance = 'f'
ORDER BY st.starts
SQL;
@ -578,6 +579,7 @@ WHERE st.ends > :startTime1
AND st.starts < :rangeEnd
AND st.playout_status > 0
AND si.ends > :startTime2
AND si.modified_instance = 'f'
ORDER BY st.starts LIMIT 3
SQL;