Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.5.x' into 2.5.x-installer

Browse source
This commit is contained in:
Albert Santoni 2015-06-16 16:34:22 -04:00
commit 8d114c7d6e
18 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/services/ShowService.php
View file

@ -241,6 +241,7 @@ class Application_Service_ShowService
}
$this->adjustSchedule($showData);
}
$con->commit();

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>