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

Moved validation workaround for show logo in from Schedule Controller, added check to prevent warning about invalid path in readfile

This commit is contained in:
Duncan Sommerville 2014-09-18 16:37:03 -04:00
parent 5dfadf6ecc
commit d5f6e8a682
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
airtime_mvc/application/services/ShowFormService.php
View File

@ -285,7 +285,8 @@ class Application_Service_ShowFormService
private function populateFormStyle($form) private function populateFormStyle($form)
{ {
$src = $this->imagePathToDataUri($this->ccShow->getDbImagePath()); $src = $this->ccShow->getDbImagePath() ?
$this->imagePathToDataUri($this->ccShow->getDbImagePath()) : '';
$form->populate( $form->populate(
array( array(
@ -463,7 +464,19 @@ class Application_Service_ShowFormService
$live = $forms["live"]->isValid($formData); $live = $forms["live"]->isValid($formData);
$record = $forms["record"]->isValid($formData); $record = $forms["record"]->isValid($formData);
$who = $forms["who"]->isValid($formData); $who = $forms["who"]->isValid($formData);
/*
* hack to prevent validating the file upload field since it
* isn't passed into $data
*/
$upload = $forms["style"]->getElement("add_show_logo");
$forms["style"]->removeElement("add_show_logo");
$style = $forms["style"]->isValid($formData); $style = $forms["style"]->isValid($formData);
// re-add the upload element
$forms["style"]->addElement($upload);
$when = $forms["when"]->isWhenFormValid($formData, $validateStartDate, $when = $forms["when"]->isWhenFormValid($formData, $validateStartDate,
$originalStartDate, $editShow, $instanceId); $originalStartDate, $editShow, $instanceId);
@ -504,7 +517,7 @@ class Application_Service_ShowFormService
return ($what && $live && $record && $who && $style && $when && return ($what && $live && $record && $who && $style && $when &&
$repeats && $absRebroadcast && $rebroadcast); $repeats && $absRebroadcast && $rebroadcast);
} }
public function calculateDuration($start, $end, $timezone) public function calculateDuration($start, $end, $timezone)
{ {
try { try {