From 470f0b2a7f76dc4ddd1bb0ca00b7532e263a0fea Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 11 Oct 2013 16:30:49 -0400 Subject: [PATCH] CC-5408 : Can't add content to now playing show on calendar page can schedule the now playing show from the calendar page. --- .../application/services/CalendarService.php | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/airtime_mvc/application/services/CalendarService.php b/airtime_mvc/application/services/CalendarService.php index c32f1fb41..f6c5ea7a2 100644 --- a/airtime_mvc/application/services/CalendarService.php +++ b/airtime_mvc/application/services/CalendarService.php @@ -79,22 +79,27 @@ class Application_Service_CalendarService "url" => $baseUrl."schedule/show-content-dialog"); } } else { - //Show content can be modified from the calendar if: - // the show has not started, + // Show content can be modified from the calendar if: // the user is admin or hosting the show, // the show is not recorded - if ($now < $start && ($isAdminOrPM || $isHostOfShow) && - !$this->ccShowInstance->isRecorded() ) { - - $menu["schedule"] = array( - "name"=> _("Add / Remove Content"), - "icon" => "add-remove-content", - "url" => $baseUrl."showbuilder/builder-dialog/"); - - $menu["clear"] = array( - "name"=> _("Remove All Content"), - "icon" => "remove-all-content", - "url" => $baseUrl."schedule/clear-show"); + + if ($now < $end && ($isAdminOrPM || $isHostOfShow) && + !$this->ccShowInstance->isRecorded() ) { + + $menu["schedule"] = array( + "name"=> _("Add / Remove Content"), + "icon" => "add-remove-content", + "url" => $baseUrl."showbuilder/builder-dialog/"); + + } + + if ($now < $start && ($isAdminOrPM || $isHostOfShow) && + !$this->ccShowInstance->isRecorded() ) { + + $menu["clear"] = array( + "name"=> _("Remove All Content"), + "icon" => "remove-all-content", + "url" => $baseUrl."schedule/clear-show"); } //"Show Content" should be a menu item at all times except when