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

CC-3174 : showbuilder 

fixing now playing to remove the playlist part.
This commit is contained in:
Naomi Aro 2012-02-27 12:53:21 +01:00
parent 8ae303de83
commit 4a02d12600
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,16 +714,13 @@ class Application_Model_ShowInstance {
." ft.artist_name as artist_name," ." ft.artist_name as artist_name,"
." ft.album_title as album_title," ." ft.album_title as album_title,"
." s.name as show_name," ." s.name as show_name,"
." si.id as instance_id," ." si.id as instance_id"
." pt.name as playlist_name" ." FROM {$CC_CONFIG['showInstances']} si"
." FROM $CC_CONFIG[showInstances] si" ." LEFT JOIN {$CC_CONFIG['scheduleTable']} st"
." LEFT JOIN $CC_CONFIG[scheduleTable] st"
." ON st.instance_id = si.id" ." ON st.instance_id = si.id"
." LEFT JOIN $CC_CONFIG[playListTable] pt" ." LEFT JOIN {$CC_CONFIG['filesTable']} ft"
." ON st.playlist_id = pt.id"
." LEFT JOIN $CC_CONFIG[filesTable] ft"
." ON st.file_id = ft.id" ." ON st.file_id = ft.id"
." LEFT JOIN $CC_CONFIG[showTable] s" ." LEFT JOIN {$CC_CONFIG['showTable']} s"
." ON si.show_id = s.id" ." ON si.show_id = s.id"
." WHERE ((si.starts < TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends > TIMESTAMP '$timeNow' - INTERVAL '$start seconds')" ." WHERE ((si.starts < TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends > TIMESTAMP '$timeNow' - INTERVAL '$start seconds')"
." OR (si.starts > TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends < TIMESTAMP '$timeNow' + INTERVAL '$end seconds')" ." OR (si.starts > TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends < TIMESTAMP '$timeNow' + INTERVAL '$end seconds')"
@ -732,6 +729,8 @@ class Application_Model_ShowInstance {
." AND si.id = $instanceId" ." AND si.id = $instanceId"
." ORDER BY si.starts, st.starts"; ." ORDER BY si.starts, st.starts";
Logging::log($sql);
return $CC_DBC->GetAll($sql); return $CC_DBC->GetAll($sql);
} }