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

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

Browse source
This commit is contained in:
Yuchen Wang 2011-11-14 00:35:27 -05:00
commit becaf7a152
12 changed files with 114 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -415,7 +415,7 @@ class ApiController extends Zend_Controller_Action
$show_inst->setRecordedFile($file_id);
$show_name = $show_inst->getName();
$show_genre = $show_inst->getGenre();
$show_start_time = ConvertToLocalDateTimeString($show_inst->getShowStart());
$show_start_time = ConvertToLocalDateTimeString($show_inst->getShowInstanceStart());
} catch (Exception $e){
//we've reached here probably because the show was

6
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -160,8 +160,10 @@ class PreferenceController extends Zend_Controller_Action
$num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
$form = new Application_Form_StreamSetting();
$form->setSetting($setting);
$form->startFrom();
if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
$form->setSetting($setting);
$form->startFrom();
}
for($i=1; $i<=$num_of_stream; $i++){
$subform = new Application_Form_StreamSettingSubForm();
$subform->setPrefix($i);

16
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -181,8 +181,8 @@ class ScheduleController extends Zend_Controller_Action
$params = '/format/json/id/#id#';
$showStartDateHelper = Application_Model_DateHelper::ConvertToLocalDateTime($show->getShowStart());
$showEndDateHelper = Application_Model_DateHelper::ConvertToLocalDateTime($show->getShowEnd());
$showStartDateHelper = Application_Model_DateHelper::ConvertToLocalDateTime($show->getShowInstanceStart());
$showEndDateHelper = Application_Model_DateHelper::ConvertToLocalDateTime($show->getShowInstanceEnd());
$menu = array();
@ -355,8 +355,8 @@ class ScheduleController extends Zend_Controller_Action
return false;
}
$start_timestamp = $show->getShowStart();
$end_timestamp = $show->getShowEnd();
$start_timestamp = $show->getShowInstanceStart();
$end_timestamp = $show->getShowInstanceEnd();
//check to make sure show doesn't overlap.
if(Application_Model_Show::getShows(new DateTime($start_timestamp, new DateTimeZone("UTC")),
@ -408,7 +408,7 @@ class ScheduleController extends Zend_Controller_Action
return false;
}
$originalShowName = $originalShow->getName();
$originalShowStart = $originalShow->getShowStart();
$originalShowStart = $originalShow->getShowInstanceStart();
$timestamp = strtotime($originalShowStart);
$this->view->additionalShowInfo =
@ -465,8 +465,8 @@ class ScheduleController extends Zend_Controller_Action
'add_show_genre' => $show->getGenre(),
'add_show_description' => $show->getDescription()));
$startsDateTime = new DateTime($showInstance->getShowStart(), new DateTimeZone("UTC"));
$endsDateTime = new DateTime($showInstance->getShowEnd(), new DateTimeZone("UTC"));
$startsDateTime = new DateTime($showInstance->getShowInstanceStart(), new DateTimeZone("UTC"));
$endsDateTime = new DateTime($showInstance->getShowInstanceEnd(), new DateTimeZone("UTC"));
$startsDateTime->setTimezone(new DateTimeZone(date_default_timezone_get()));
$endsDateTime->setTimezone(new DateTimeZone(date_default_timezone_get()));
@ -760,7 +760,7 @@ class ScheduleController extends Zend_Controller_Action
}
$show = new Application_Model_Show($showInstance->getShowId());
$show->cancelShow($showInstance->getShowStart());
$show->cancelShow($showInstance->getShowInstanceStart());
}
}