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

crlf

This commit is contained in:
Naomi 2013-07-30 19:25:06 -04:00
parent 7ca3048f36
commit a170ee7308
2 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
airtime_mvc/application/controllers/PlayouthistoryController.php
View File

@ -137,9 +137,9 @@ class PlayouthistoryController extends Zend_Controller_Action
$historyService = new Application_Service_HistoryService();
$historyService->createPlayedItem($params);
}
catch (Exception $e) {
Logging::info($e);
Logging::info($e->getMessage());
catch (Exception $e) {
Logging::info($e);
Logging::info($e->getMessage());
}
}
@ -195,10 +195,10 @@ class PlayouthistoryController extends Zend_Controller_Action
public function configureItemTemplateAction() {
$request = $this->getRequest();
$params = $request->getPost();
Logging::info($params);
$request = $this->getRequest();
$params = $request->getPost();
Logging::info($params);
try {
$CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir();
@ -218,10 +218,10 @@ class PlayouthistoryController extends Zend_Controller_Action
$this->view->fileMD = $historyService->getFileMetadataTypes();
$this->view->fields = $historyService->getFieldTypes();
$this->view->required_fields = $mandatoryFields;
}
catch (Exception $e) {
Logging::info($e);
Logging::info($e->getMessage());
}
catch (Exception $e) {
Logging::info($e);
Logging::info($e->getMessage());
}
}
@ -241,26 +241,26 @@ class PlayouthistoryController extends Zend_Controller_Action
}
}
public function setItemTemplateDefaultAction()
{
$request = $this->getRequest();
$params = $request->getPost();
public function setItemTemplateDefaultAction()
{
$request = $this->getRequest();
$params = $request->getPost();
Logging::info($params);
$template_id = $this->_getParam('id', null);
if (empty($template_id)) {
return;
}
try {
$historyService = new Application_Service_HistoryService();
$historyService->setConfiguredItemTemplate($template_id);
}
catch (Exception $e) {
Logging::info($e);
Logging::info($e->getMessage());
}
}
try {
$historyService = new Application_Service_HistoryService();
$historyService->setConfiguredItemTemplate($template_id);
}
catch (Exception $e) {
Logging::info($e);
Logging::info($e->getMessage());
}
}
public function editTemplateAction()

46
airtime_mvc/application/services/HistoryService.php
View File

@ -301,9 +301,9 @@ USING (history_id)
}
}
if (count($md) > 0) {
if (count($md) > 0) {
$f = Application_Model_StoredFile::createWithFile($file, $this->con);
$f->setDbColMetadata($md);
$f->setDbColMetadata($md);
}
foreach ($metadata as $key => $val) {
@ -498,7 +498,7 @@ USING (history_id)
private function loadTemplate($id) {
try {
try {
$template = CcPlayoutHistoryTemplateQuery::create()->findPk($id, $this->con);
$c = new Criteria();
@ -520,10 +520,10 @@ USING (history_id)
$data["name"] = $template->getDbName();
$data["fields"] = $fields;
return $data;
}
catch (Exception $e) {
throw $e;
return $data;
}
catch (Exception $e) {
throw $e;
}
}
@ -544,7 +544,7 @@ USING (history_id)
public function getListItemTemplates() {
$list = array();
try {
$templates = CcPlayoutHistoryTemplateQuery::create()
@ -556,28 +556,28 @@ USING (history_id)
}
return $list;
}
catch (Exception $e) {
throw $e;
}
catch (Exception $e) {
throw $e;
}
}
public function getConfiguredItemTemplate() {
try {
public function getConfiguredItemTemplate() {
try {
$id = Application_Model_Preference::GetHistoryItemTemplate();
return $this->getItemTemplate($id);
}
catch (Exception $e) {
throw $e;
}
return $this->getItemTemplate($id);
}
catch (Exception $e) {
throw $e;
}
}
public function setConfiguredItemTemplate($id) {
try {
Application_Model_Preference::SetHistoryItemTemplate($id);
}
catch (Exception $e) {
throw $e;
catch (Exception $e) {
throw $e;
}
}
@ -615,9 +615,9 @@ USING (history_id)
$this->con->commit();
}
catch (Exception $e) {
$this->con->rollback();
throw $e;
catch (Exception $e) {
$this->con->rollback();
throw $e;
}
}