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

Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel

Browse source
This commit is contained in:
denise 2013-01-30 10:35:29 -05:00
commit 694c54f272
3 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,21 @@ SQL;
return (is_numeric($count) && ($count != '0'));
}
public static function getAllFutureScheduledFiles()
{
$con = Propel::getConnection();
$sql = <<<SQL
SELECT distinct(file_id)
FROM cc_schedule
WHERE ends > now() AT TIME ZONE 'UTC'
SQL;
$files = $con->query($sql)->fetchAll();
$real_files = array();
foreach ($files as $f) {
$real_files[] = $f['file_id'];
}
return $real_files;
}
/**
* Returns data related to the scheduled items.
*

5
airtime_mvc/application/models/StoredFile.php
View file

@ -771,6 +771,8 @@ SQL;
}
$results = Application_Model_Datatables::findEntries($con, $displayColumns, $fromTable, $datatables);
$futureScheduledFiles = Application_Model_Schedule::getAllFutureScheduledFiles();
//Used by the audio preview functionality in the library.
foreach ($results['aaData'] as &$row) {
@ -812,6 +814,9 @@ SQL;
if ($type == "au") {
$row['audioFile'] = $row['id'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION);
$row['image'] = '<img title="'._("Track preview").'" src="'.$baseUrl.'css/images/icon_audioclip.png">';
if (in_array($row['id'], $futureScheduledFiles)) {
$row['checkbox'] .= '<span class="small-icon show-partial-filled track-future"></span>';
}
} elseif ($type == "pl") {
$row['image'] = '<img title="'._("Playlist preview").'" src="'.$baseUrl.'css/images/icon_playlist.png">';
} elseif ($type == "st") {