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

CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell

This commit is contained in:
denise 2013-05-08 16:28:45 -04:00
parent 8344f3f3d5
commit 2e69b35d75
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,13 +367,6 @@ class ScheduleController extends Zend_Controller_Action
$service_showForm = new Application_Service_ShowFormService($showId, $instanceId); $service_showForm = new Application_Service_ShowFormService($showId, $instanceId);
$isAdminOrPM = $currentUser->isAdminOrPM(); $isAdminOrPM = $currentUser->isAdminOrPM();
/*$isHostOfShow = $currentUser->isHostOfShow($showId);
// in case a user was once a dj and had been assigned to a show
// but was then changed to an admin user we need to allow
// the user to edit the show as an admin (CC-4925)
if ($isHostOfShow && !$isAdminOrPM) {
$this->view->action = "dj-edit-show";
}*/
$forms = $this->createShowFormAction(); $forms = $this->createShowFormAction();
@ -397,30 +390,11 @@ class ScheduleController extends Zend_Controller_Action
if ($currentUser->isAdminOrPM()) { if ($currentUser->isAdminOrPM()) {
$this->createShowFormAction(true); $this->createShowFormAction(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');
} }
} }
/*public function djEditShowAction()
{
$js = $this->_getParam('data');
$data = array();
//need to convert from serialized jQuery array.
foreach ($js as $j) {
$data[$j["name"]] = $j["value"];
}
//update cc_show
$show = new Application_Model_Show($data["add_show_id"]);
$show->setAirtimeAuthFlag($data["cb_airtime_auth"]);
$show->setCustomAuthFlag($data["cb_custom_auth"]);
$show->setCustomUsername($data["custom_username"]);
$show->setCustomPassword($data["custom_password"]);
$this->view->edit = true;
}*/
public function editRepeatingShowInstanceAction(){ public function editRepeatingShowInstanceAction(){
$js = $this->_getParam('data'); $js = $this->_getParam('data');
$data = array(); $data = array();