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-05 16:14:23 -04:00
commit 87e58282de
6 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1833,7 +1833,8 @@ SELECT si.starts AS start_timestamp,
starts,
ends
FROM cc_show_instances si,
cc_show s
LEFT JOIN cc_show s
ON si.instance_id = s.id
WHERE si.show_id = s.id
AND si.starts <= :timeNow1::timestamp
AND si.ends > :timeNow2::timestamp
@ -1875,7 +1876,8 @@ SELECT si.starts AS start_timestamp,
starts,
ends
FROM cc_show_instances si,
cc_show s
LEFT JOIN cc_show s
ON si.instance_id = s.id
WHERE si.show_id = s.id
AND si.starts > :timeNow1::timestamp - INTERVAL '2 days'
AND si.ends < :timeNow2::timestamp + INTERVAL '2 days'
@ -2012,9 +2014,10 @@ SELECT si.starts AS start_timestamp,
s.url,
starts,
ends
FROM cc_show_instances,
cc_show
WHERE si.show_id = s.id"
FROM cc_show_instances si
LEFT JOIN cc_show s
ON si.instance_id = s.id
WHERE si.show_id = s.id
AND si.starts >= :timeStart::timestamp
AND si.starts < :timeEnd::timestamp
AND modified_instance != TRUE