From a7fc31012fdcf476f55740728460544825b8498c Mon Sep 17 00:00:00 2001 From: James Date: Thu, 19 Apr 2012 11:29:19 -0400 Subject: [PATCH] CC-3689: Remove Edit Show Instance ability - done --- .../application/controllers/ScheduleController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 4b5a92320..ff9b73a8b 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -263,9 +263,10 @@ class ScheduleController extends Zend_Controller_Action } } else { if($instance->isRepeating()){ - $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); + /*$menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); $menu["edit"]["items"]["instance"] = array("name"=> "Edit Show Instance", "icon" => "edit", "url" => "/Schedule/populate-show-instance-form"); - $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form"); + $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");*/ + $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => "/Schedule/populate-show-form"); }else{ if($instance->isRebroadcast()){ $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form"); @@ -284,9 +285,10 @@ class ScheduleController extends Zend_Controller_Action if ($isAdminOrPM || $isDJ) { if($instance->isRepeating()){ - $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); + /*$menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); $menu["edit"]["items"]["instance"] = array("name"=> "Edit Show Instance", "icon" => "edit", "url" => "/Schedule/populate-show-instance-form"); - $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form"); + $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");*/ + $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => "/Schedule/populate-show-form"); }else{ if($instance->isRebroadcast()){ $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form"); @@ -726,7 +728,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->edit = true; } - public function editShowInstanceAction(){ + /*public function editShowInstanceAction(){ $js = $this->_getParam('data'); $data = array(); @@ -743,7 +745,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->addNewShow = false; $this->view->form = $this->view->render('schedule/add-show-form.phtml'); } - } + }*/ public function editShowAction(){