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

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

This commit is contained in:
James 2012-06-29 10:56:55 -04:00
parent a8792a7b97 6c1c36fa9b
commit 0b069c2f54
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,6 +221,7 @@ class Application_Model_ShowBuilder {
$row["title"] = $p_item["show_name"]; $row["title"] = $p_item["show_name"];
$row["instance"] = intval($p_item["si_id"]); $row["instance"] = intval($p_item["si_id"]);
$row["image"] = ''; $row["image"] = '';
$row["id"] = -1;
$this->getScheduledStatus($startsEpoch, $endsEpoch, $row); $this->getScheduledStatus($startsEpoch, $endsEpoch, $row);
@ -310,6 +311,7 @@ class Application_Model_ShowBuilder {
$row = $this->defaultRowArray; $row = $this->defaultRowArray;
$row["footer"] = true; $row["footer"] = true;
$row["instance"] = intval($p_item["si_id"]); $row["instance"] = intval($p_item["si_id"]);
$row["id"] = -1;
$this->getRowTimestamp($p_item, $row); $this->getRowTimestamp($p_item, $row);
$showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC")); $showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC"));

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

@ -11,6 +11,7 @@ var AIRTIME = (function(AIRTIME){
$lib, $lib,
cursors = [], cursors = [],
cursorIds = []; cursorIds = [];
showInstanceIds = [];
if (AIRTIME.showbuilder === undefined) { if (AIRTIME.showbuilder === undefined) {
AIRTIME.showbuilder = {}; AIRTIME.showbuilder = {};
@ -212,9 +213,15 @@ var AIRTIME = (function(AIRTIME){
checkError(json); checkError(json);
cursorIds = []; cursorIds = [];
/* We need to keep record of which show the cursor belongs to
* in the case where more than one show is displayed in the show builder
* because header and footer rows have the same id
*/
showInstanceIds = [];
cursors = $(".cursor-selected-row"); cursors = $(".cursor-selected-row");
for (i = 0; i < cursors.length; i++) { for (i = 0; i < cursors.length; i++) {
cursorIds.push(($(cursors.get(i)).attr("id"))); cursorIds.push(($(cursors.get(i)).attr("id")));
showInstanceIds.push(($(cursors.get(i)).attr("si_id")));
} }
oSchedTable.fnDraw(); oSchedTable.fnDraw();
@ -588,6 +595,7 @@ var AIRTIME = (function(AIRTIME){
else { else {
$nRow.addClass("sb-allowed"); $nRow.addClass("sb-allowed");
$nRow.attr("id", aData.id); $nRow.attr("id", aData.id);
$nRow.attr("si_id", aData.instance);
} }
//status used to colour tracks. //status used to colour tracks.
@ -670,7 +678,7 @@ var AIRTIME = (function(AIRTIME){
//re-highlight selected cursors before draw took place //re-highlight selected cursors before draw took place
for (i = 0; i < cursorIds.length; i++) { for (i = 0; i < cursorIds.length; i++) {
$tr = $table.find("tr[id="+cursorIds[i]+"]"); $tr = $table.find("tr[id="+cursorIds[i]+"][si_id="+showInstanceIds[i]+"]");
mod.selectCursor($tr); mod.selectCursor($tr);
} }