From f4bc1d3810547c67dcce81c37169373987ef86c1 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 21 Mar 2014 12:05:59 -0400 Subject: [PATCH] CC-5450 : Refactor Media Management (Classes/DB) in Airtime formatters back on now playing, over booked button check fix. --- airtime_mvc/application/models/ShowBuilder.php | 10 +++++++--- airtime_mvc/public/js/airtime/showbuilder/builder.js | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index 7efe4ffb1..6e1d3dad1 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -331,9 +331,13 @@ class Application_Model_ShowBuilder $row["album"] = htmlspecialchars($mediaItem->getSource()); $row["mime"] = $mediaItem->getMime(); - $row["cuein"] = $scheduledItem->getDbCueIn(); - $row["cueout"] = $scheduledItem->getDbCueOut(); - $row['runtime'] = $scheduledItem->getDbClipLength(); + $formatter = new Format_HHMMSSULength($scheduledItem->getDbCueIn()); + $row["cuein"] = $formatter->format(); + $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["fadeout"] = $scheduledItem->getDbFadeOut(); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index ee83365fb..8d4dfe91f 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -121,7 +121,7 @@ var AIRTIME = (function(AIRTIME){ }; 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"); if ($over.length !== 0) {