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

CC-4568: Show preview broken in Now Playing page 

- fixed
This commit is contained in:
James 2012-10-16 11:06:01 -04:00
parent 9d23e61acc
commit 8a93717415
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/AudiopreviewController.php
View File

@ -278,6 +278,7 @@ class AudiopreviewController extends Zend_Controller_Action
'element_artist' => isset($track['creator']) ? $track['creator'] : "", 'element_artist' => isset($track['creator']) ? $track['creator'] : "",
'element_position' => $position, 'element_position' => $position,
'element_id' => ++$position, 'element_id' => ++$position,
'mime' => isset($track['mime'])?$track['mime']:""
); );
$elementMap['type'] = $track['type']; $elementMap['type'] = $track['type'];

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

@ -677,7 +677,8 @@ FROM (
f.length AS length, f.length AS length,
f.artist_name AS creator, f.artist_name AS creator,
f.file_exists AS EXISTS, f.file_exists AS EXISTS,
f.filepath AS filepath f.filepath AS filepath,
f.mime AS mime
FROM cc_schedule AS s FROM cc_schedule AS s
LEFT JOIN cc_files AS f ON f.id = s.file_id LEFT JOIN cc_files AS f ON f.id = s.file_id
WHERE s.instance_id = :instance_id1 WHERE s.instance_id = :instance_id1
@ -693,7 +694,8 @@ FROM (
ws.length AS length, ws.length AS length,
sub.login AS creator, sub.login AS creator,
't'::boolean AS EXISTS, 't'::boolean AS EXISTS,
ws.url AS filepath ws.url AS filepath,
ws.mime as mime
FROM cc_schedule AS s FROM cc_schedule AS s
LEFT JOIN cc_webstream AS ws ON ws.id = s.stream_id LEFT JOIN cc_webstream AS ws ON ws.id = s.stream_id
LEFT JOIN cc_subjs AS sub ON ws.creator_id = sub.id LEFT JOIN cc_subjs AS sub ON ws.creator_id = sub.id