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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-09-06 11:21:47 -04:00
parent 9b29f5e701 9079f29584
commit 35a5e38aca
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -781,7 +781,10 @@ class ScheduleController extends Zend_Controller_Action
$data['add_show_record'] = $show->isRecorded(); $data['add_show_record'] = $show->isRecorded();
$origianlShowStartDateTime = Application_Common_DateHelper::ConvertToLocalDateTime($show->getStartDateAndTime()); $origianlShowStartDateTime = Application_Common_DateHelper::ConvertToLocalDateTime($show->getStartDateAndTime());
$success = Application_Model_Schedule::addUpdateShow($data, $this, $validateStartDate, $origianlShowStartDateTime, true, $data['add_show_instance_id']);
$success = Application_Model_Schedule::addUpdateShow($data, $this,
$validateStartDate, $origianlShowStartDateTime, true,
$data['add_show_instance_id']);
if ($success) { if ($success) {
$this->view->addNewShow = true; $this->view->addNewShow = true;
@ -818,14 +821,17 @@ class ScheduleController extends Zend_Controller_Action
} }
$validateStartDate = true; $validateStartDate = true;
$success = Application_Model_Schedule::addUpdateShow($data, $this, $validateStartDate); $success = Application_Model_Schedule::addUpdateShow($data, $this,
$validateStartDate);
if ($success) { if ($success) {
$this->view->addNewShow = true; $this->view->addNewShow = true;
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml'); $this->view->newForm = $this->view->render(
'schedule/add-show-form.phtml');
} else { } else {
$this->view->addNewShow = true; $this->view->addNewShow = true;
$this->view->form = $this->view->render('schedule/add-show-form.phtml'); $this->view->form = $this->view->render('
schedule/add-show-form.phtml');
} }
} }