From d0035e8e4c3af11fb509f0ff9ac067602512bd34 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 31 Mar 2011 16:39:32 -0400 Subject: [PATCH] CC-2119: "Show Content" should display what it is going to rebroadcast -done --- application/controllers/ScheduleController.php | 11 +++++++++++ .../views/scripts/schedule/show-content-dialog.phtml | 1 + 2 files changed, 12 insertions(+) diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php index d1fa6cf90..9473cf90e 100644 --- a/application/controllers/ScheduleController.php +++ b/application/controllers/ScheduleController.php @@ -319,6 +319,17 @@ class ScheduleController extends Zend_Controller_Action $showInstanceId = $this->_getParam('id'); $show = new ShowInstance($showInstanceId); + $originalShowId = $show->isRebroadcast(); + if (!is_null($originalShowId)){ + $originalShow = new ShowInstance($originalShowId); + $originalShowName = $originalShow->getName(); + $originalShowStart = $originalShow->getShowStart(); + + $timestamp = strtotime($originalShowStart); + $this->view->additionalShowInfo = + "Rebroadcast of show \"$originalShowName\" from " + .date("l, F jS", $timestamp)." at ".date("G:i", $timestamp); + } $this->view->showContent = $show->getShowListContent(); $this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml'); unset($this->view->showContent); diff --git a/application/views/scripts/schedule/show-content-dialog.phtml b/application/views/scripts/schedule/show-content-dialog.phtml index 59dab4fbe..4e5aac630 100644 --- a/application/views/scripts/schedule/show-content-dialog.phtml +++ b/application/views/scripts/schedule/show-content-dialog.phtml @@ -1,4 +1,5 @@
+
additionalShowInfo; ?>
Start