Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-4358: Calendar: Show Content: Undefined Index 

-fixed
This commit is contained in:
denise 2012-09-05 16:07:40 -04:00
parent f86fa8f945
commit 8ec9ccedf3
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -655,6 +655,9 @@ FROM (
0::INTEGER as type , 0::INTEGER as type ,
f.id AS item_id, f.id AS item_id,
f.track_title, f.track_title,
f.album_title AS album,
f.genre AS genre,
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
@ -668,6 +671,9 @@ FROM (
1::INTEGER as type, 1::INTEGER as type,
ws.id AS item_id, ws.id AS item_id,
(ws.name || ': ' || ws.url) AS title, (ws.name || ': ' || ws.url) AS title,
null AS album,
null AS genre,
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
@ -688,8 +694,10 @@ SQL;
$dt->setTimezone(new DateTimeZone(date_default_timezone_get())); $dt->setTimezone(new DateTimeZone(date_default_timezone_get()));
$row["starts"] = $dt->format("Y-m-d H:i:s"); $row["starts"] = $dt->format("Y-m-d H:i:s");
$formatter = new LengthFormatter($row["clip_length"]); if (isset($row['length'])) {
$row["clip_length"] = $formatter->format(); $formatter = new LengthFormatter($row["length"]);
$row["length"] = $formatter->format();
}
} }

8
airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
View File

@ -11,12 +11,12 @@
</tr> </tr>
<?php $i=0; ?> <?php $i=0; ?>
<?php foreach($this->showContent as $row): ?> <?php foreach($this->showContent as $row): ?>
<tr id="au_<?php echo $row["file_id"] ?>" class="<?php if($i&1){echo "even";}else{echo "odd";}?>"> <tr id="au_<?php echo $row["item_id"] ?>" class="<?php if($i&1){echo "even";}else{echo "odd";}?>">
<td><?php echo $row["starts"] ?></td> <td><?php echo $row["starts"] ?></td>
<td><?php echo $row["track_title"] ?></td> <td><?php echo $row["track_title"] ?></td>
<td><?php echo $row["artist_name"] ?></td> <td><?php echo $row["creator"] ?></td>
<td><?php echo $row["album_title"] ?></td> <td><?php echo $row["album"] ?></td>
<td class="library_length"><?php echo $row["clip_length"] ?></td> <td class="library_length"><?php echo $row["length"] ?></td>
<td><?php echo $row["genre"] ?></td> <td><?php echo $row["genre"] ?></td>
</tr> </tr>
<?php $i=$i+1; ?> <?php $i=$i+1; ?>