Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-5997: Tracks get scheduled outside of the show start and end time

This commit is contained in:
drigato 2015-05-11 14:57:20 -04:00
parent 56e5e959ec
commit 2953576921
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
airtime_mvc/application/services/ShowService.php
View File

@ -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);
}

9
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View File

@ -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>