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

CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.

Browse source
This commit is contained in:
Naomi Aro 2012-03-29 17:37:18 +02:00
parent 12b23443db
commit 5a24331ef6
6 changed files with 5 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -376,48 +376,6 @@ class ApiController extends Zend_Controller_Action
}
}
/*
public function notifyScheduleGroupPlayAction()
{
global $CC_CONFIG;
// disable the view and the layout
$this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
$api_key = $this->_getParam('api_key');
if(!in_array($api_key, $CC_CONFIG["apiKey"]))
{
header('HTTP/1.0 401 Unauthorized');
print 'You are not allowed to access this resource.';
exit;
}
PEAR::setErrorHandling(PEAR_ERROR_RETURN);
$schedule_group_id = $this->_getParam("schedule_id");
if (is_numeric($schedule_group_id)) {
$sg = new Application_Model_ScheduleGroup($schedule_group_id);
if ($sg->exists()) {
$result = $sg->notifyGroupStartPlay();
if (!PEAR::isError($result)) {
echo json_encode(array("status"=>1, "message"=>""));
exit;
} else {
echo json_encode(array("status"=>0, "message"=>"DB Error:".$result->getMessage()));
exit;
}
} else {
echo json_encode(array("status"=>0, "message"=>"Schedule group does not exist: ".$schedule_group_id));
exit;
}
} else {
echo json_encode(array("status"=>0, "message"=>"Incorrect or non-numeric arguments given."));
exit;
}
}
*/
public function recordedShowsAction()
{
global $CC_CONFIG;

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

@ -109,7 +109,7 @@ class ShowbuilderController extends Zend_Controller_Action
//determine whether to remove/hide/display the library.
$showLib = false;
if (!$user->isGuest()) {
$hideLib = false;
$disableLib = false;
$data = Application_Model_Preference::GetValue("nowplaying_screen", true);
if ($data != "") {
$settings = unserialize($data);
@ -120,9 +120,9 @@ class ShowbuilderController extends Zend_Controller_Action
}
}
else {
$hideLib = true;
$disableLib = true;
}
$this->view->hideLib = $hideLib;
$this->view->disableLib = $disableLib;
$this->view->showLib = $showLib;
//populate date range form for show builder.