diff --git a/app/Controller/GalaxyClusterBlocklistsController.php b/app/Controller/GalaxyClusterBlocklistsController.php index 594f1bebb..3182ff2b1 100644 --- a/app/Controller/GalaxyClusterBlocklistsController.php +++ b/app/Controller/GalaxyClusterBlocklistsController.php @@ -34,20 +34,19 @@ class GalaxyClusterBlocklistsController extends AppController } $this->set('passedArgs', json_encode($passedArgs)); $this->set('passedArgsArray', $passedArgsArray); - $this->BlockList->index($this->_isRest(), $params); + return $this->BlockList->index($this->_isRest(), $params); } public function add() { - $this->BlockList->add($this->_isRest()); $this->set('action', 'add'); + return $this->BlockList->add($this->_isRest()); } public function edit($id) { - $this->BlockList->edit($this->_isRest(), $id); $this->set('action', 'edit'); - $this->render('add'); + return $this->BlockList->edit($this->_isRest(), $id); } public function delete($id) @@ -61,7 +60,7 @@ class GalaxyClusterBlocklistsController extends AppController } $id = $entry['GalaxyClusterBlocklist']['id']; } - $this->BlockList->delete($this->_isRest(), $id); + return $this->BlockList->delete($this->_isRest(), $id); } public function massDelete() diff --git a/app/Model/GalaxyClusterBlocklist.php b/app/Model/GalaxyClusterBlocklist.php index c019bd964..8834cdd0b 100644 --- a/app/Model/GalaxyClusterBlocklist.php +++ b/app/Model/GalaxyClusterBlocklist.php @@ -16,6 +16,7 @@ class GalaxyClusterBlocklist extends AppModel ); public $blocklistFields = array('cluster_uuid', 'comment', 'cluster_info', 'cluster_orgc'); + public $blocklistTarget = 'cluster'; public $validate = array( 'cluster_uuid' => array(