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

Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev

Browse source
This commit is contained in:
Duncan Sommerville 2015-07-16 11:03:53 -04:00
commit 40d8212c13
20 changed files with 396 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@ class ApiController extends Zend_Controller_Action
->addActionContext('update-stream-setting-table' , 'json')
->addActionContext('update-replay-gain-value' , 'json')
->addActionContext('update-cue-values-by-silan' , 'json')
->addActionContext('get-usability-hint' , 'json')
->initContext();
}
@ -1466,5 +1467,13 @@ class ApiController extends Zend_Controller_Action
}
$this->_helper->json->sendJson(array(1));
}
public function getUsabilityHintAction()
{
$userPath = $this->_getParam("userPath");
$hint = Application_Common_UsabilityHints::getUsabilityHint($userPath);
$this->_helper->json->sendJson($hint);
}
}

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

@ -98,6 +98,9 @@ class ScheduleController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/libs/moment.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/libs/moment-timezone-with-data-2010-2020.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/events/library_showbuilder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@ -584,7 +587,20 @@ class ScheduleController extends Zend_Controller_Action
$forms = $this->createShowFormAction();
$this->view->addNewShow = true;
if ($data['add_show_start_now'] == "now") {
//have to use the timezone the user has entered in the form to check past/present
$showTimezone = new DateTimeZone($data["add_show_timezone"]);
$nowDateTime = new DateTime("now", $showTimezone);
//$showStartDateTime = new DateTime($start_time, $showTimezone);
//$showEndDateTime = new DateTime($end_time, $showTimezone);
$data['add_show_start_time'] = $nowDateTime->format("H:i");
$data['add_show_start_date'] = $nowDateTime->format("Y-m-d");
}
if ($service_showForm->validateShowForms($forms, $data)) {
// Get the show ID from the show service to pass as a parameter to the RESTful ShowImageController
$this->view->showId = $service_show->addUpdateShow($data);