From e60db9e031191f86e793c0afd758ef6179cefe91 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 23 Sep 2011 15:37:45 -0400 Subject: [PATCH] CC-2860: When recording a show, UTC time is displayed on the text field of right progress bar. --- airtime_mvc/application/models/Show.php | 1 + airtime_mvc/public/js/airtime/dashboard/playlist.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 5ca843029..6f241e999 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1296,6 +1296,7 @@ class Application_Model_Show { ." AND si.ends > TIMESTAMP '$timeNow'"; $rows = $CC_DBC->GetAll($sql); + return $rows; } diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 0f36afef3..a740a9227 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -167,7 +167,7 @@ function updatePlaybar(){ $('#show-length').empty(); if (currentShow.length > 0){ - $('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime)); + $('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime + timezoneOffset) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime + timezoneOffset)); } /* Column 2 update */