Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel
This commit is contained in:
commit
694c54f272
|
@ -20,6 +20,21 @@ SQL;
|
||||||
return (is_numeric($count) && ($count != '0'));
|
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.
|
* Returns data related to the scheduled items.
|
||||||
*
|
*
|
||||||
|
|
|
@ -771,6 +771,8 @@ SQL;
|
||||||
}
|
}
|
||||||
|
|
||||||
$results = Application_Model_Datatables::findEntries($con, $displayColumns, $fromTable, $datatables);
|
$results = Application_Model_Datatables::findEntries($con, $displayColumns, $fromTable, $datatables);
|
||||||
|
|
||||||
|
$futureScheduledFiles = Application_Model_Schedule::getAllFutureScheduledFiles();
|
||||||
|
|
||||||
//Used by the audio preview functionality in the library.
|
//Used by the audio preview functionality in the library.
|
||||||
foreach ($results['aaData'] as &$row) {
|
foreach ($results['aaData'] as &$row) {
|
||||||
|
@ -812,6 +814,9 @@ SQL;
|
||||||
if ($type == "au") {
|
if ($type == "au") {
|
||||||
$row['audioFile'] = $row['id'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION);
|
$row['audioFile'] = $row['id'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION);
|
||||||
$row['image'] = '<img title="'._("Track preview").'" src="'.$baseUrl.'css/images/icon_audioclip.png">';
|
$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") {
|
} elseif ($type == "pl") {
|
||||||
$row['image'] = '<img title="'._("Playlist preview").'" src="'.$baseUrl.'css/images/icon_playlist.png">';
|
$row['image'] = '<img title="'._("Playlist preview").'" src="'.$baseUrl.'css/images/icon_playlist.png">';
|
||||||
} elseif ($type == "st") {
|
} elseif ($type == "st") {
|
||||||
|
|
|
@ -605,6 +605,27 @@ var AIRTIME = (function(AIRTIME) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(nRow).find(".track-future").qtip({
|
||||||
|
content: {
|
||||||
|
text: $.i18n._("This track is scheduled in the future")
|
||||||
|
},
|
||||||
|
hide: {
|
||||||
|
delay: 500,
|
||||||
|
fixed: true
|
||||||
|
},
|
||||||
|
style: {
|
||||||
|
border: {
|
||||||
|
width: 0,
|
||||||
|
radius: 4
|
||||||
|
},
|
||||||
|
classes: "ui-tooltip-dark ui-tooltip-rounded"
|
||||||
|
},
|
||||||
|
position: {
|
||||||
|
my: "left bottom",
|
||||||
|
at: "right center"
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
// add a tool tip to appear when the user clicks on the type
|
// add a tool tip to appear when the user clicks on the type
|
||||||
// icon.
|
// icon.
|
||||||
|
|
Loading…
Reference in New Issue