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

CC-5450 : Refactor Media Management (Classes/DB) in Airtime 

formatters back on now playing, over booked button check fix.
This commit is contained in:
Naomi 2014-03-21 12:05:59 -04:00
parent a0c7926903
commit f4bc1d3810
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,9 +331,13 @@ class Application_Model_ShowBuilder
$row["album"] = htmlspecialchars($mediaItem->getSource()); $row["album"] = htmlspecialchars($mediaItem->getSource());
$row["mime"] = $mediaItem->getMime(); $row["mime"] = $mediaItem->getMime();
$row["cuein"] = $scheduledItem->getDbCueIn(); $formatter = new Format_HHMMSSULength($scheduledItem->getDbCueIn());
$row["cueout"] = $scheduledItem->getDbCueOut(); $row["cuein"] = $formatter->format();
$row['runtime'] = $scheduledItem->getDbClipLength(); $formatter = new Format_HHMMSSULength($scheduledItem->getDbCueOut());
$row["cueout"] = $formatter->format();
$formatter = new Format_HHMMSSULength($scheduledItem->getDbClipLength());
$row["runtime"] = $formatter->format();
$row["fadein"] = $scheduledItem->getDbFadeIn(); $row["fadein"] = $scheduledItem->getDbFadeIn();
$row["fadeout"] = $scheduledItem->getDbFadeOut(); $row["fadeout"] = $scheduledItem->getDbFadeOut();

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

@ -121,7 +121,7 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.checkTrimButton = function() { mod.checkTrimButton = function() {
var $over = $sbTable.find(".sb-over.sb-allowed"), var $over = $sbTable.find(".sb-over.sb-allowed").not(".sb-past"),
$button = $(".sb-overbooked"); $button = $(".sb-overbooked");
if ($over.length !== 0) { if ($over.length !== 0) {