From 2953576921cfa2aa0308ba1797c76937b26e7585 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 11 May 2015 14:57:20 -0400
Subject: [PATCH] CC-5997: Tracks get scheduled outside of the show start and
 end time

---
 airtime_mvc/application/services/ShowService.php | 16 +---------------
 .../views/scripts/schedule/add-show-form.phtml   |  9 +++++++++
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/airtime_mvc/application/services/ShowService.php b/airtime_mvc/application/services/ShowService.php
index a7ab3f86e..d0084d3e6 100644
--- a/airtime_mvc/application/services/ShowService.php
+++ b/airtime_mvc/application/services/ShowService.php
@@ -240,21 +240,7 @@ class Application_Service_ShowService
                         $showData["add_show_start_date"] = $this->origCcShowDay->getLocalStartDateAndTime()->format("Y-m-d");
                 }
 
-                // We don't want to adjust the cc_schedule times if ONLY the timezone has changed
-
-                // adjust schedule if the show time changed AND the timezone did not change
-                if ($this->oldShowTimezone == $showData["add_show_timezone"] &&
-                    (substr($this->origCcShowDay->getDbStartTime(), 0, 5) != $showData["add_show_start_time"])) {
-
-                    $this->adjustSchedule($showData);
-                }
-
-                // adjust the schedule if both the timezone changed AND the show time changed
-                if ($this->oldShowTimezone != $showData["add_show_timezone"] &&
-                    (substr($this->origCcShowDay->getDbStartTime(), 0, 5) != $showData["add_show_start_time"])) {
-
-                    $this->adjustSchedule($showData);
-                }
+                $this->adjustSchedule($showData);
 
             }
 
diff --git a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
index ca02864e4..f155fa61d 100644
--- a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
@@ -13,7 +13,16 @@
     </div>
     <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("When") ?></h3>
     <div id="schedule-show-when" class="collapsible-content">
+        <?php
+        if (!$this->addNewShow) {
+            $this->when->getElement('add_show_timezone')->setOptions(array('disabled' => true));
+            ?>
+            <input type="hidden" name="add_show_timezone" id="add_show_timezone" value=<?php echo $this->when->getElement('add_show_timezone')->getValue()?>>
+        <?php
+        }
+        ?>
         <?php echo $this->when; ?>
+
         <?php echo $this->repeats; ?>
     </div>
     <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Live Stream Input") ?></h3>