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

CC-3687 : Remove context menus from recorded shows since they are blank.

This commit is contained in:
Naomi Aro 2012-05-07 15:24:06 +02:00
parent 1cc84c1c85
commit a79514c8ee
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/models/ShowBuilder.php
View File

@ -251,6 +251,14 @@ class Application_Model_ShowBuilder {
else if (intval($p_item["si_record"]) === 1) {
$row["record"] = true;
$row["instance"] = intval($p_item["si_id"]);
$showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC"));
$showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC"));
$startsEpoch = floatval($showStartDT->format("U.u"));
$endsEpoch = floatval($showEndDT->format("U.u"));
$this->getScheduledStatus($startsEpoch, $endsEpoch, $row);
}
else {
$row["empty"] = true;

7
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -936,7 +936,7 @@ var AIRTIME = (function(AIRTIME){
//begin context menu initialization.
$.contextMenu({
selector: '.sb-content table tbody tr:not(.sb-empty, .sb-footer, .sb-header) td:not(.sb-checkbox, .sb-image)',
selector: '.sb-content table tbody tr:not(.sb-empty, .sb-footer, .sb-header, .sb-record) td:not(.sb-checkbox, .sb-image)',
trigger: "left",
ignoreRightClick: true,
@ -1023,10 +1023,11 @@ var AIRTIME = (function(AIRTIME){
processMenuItems(json.items);
}
});
return {
return {
items: items
};
}
});
};