MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [galaxyClusterBlocklist] Correct usage of the new blocklist 

component
pull/6120/head
mokaddem 2020-09-22 14:42:44 +02:00
parent 87e76da1c0
commit 43494a11c7
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/GalaxyClusterBlocklistsController.php
View File

@ -34,20 +34,19 @@ class GalaxyClusterBlocklistsController extends AppController
} }
$this->set('passedArgs', json_encode($passedArgs)); $this->set('passedArgs', json_encode($passedArgs));
$this->set('passedArgsArray', $passedArgsArray); $this->set('passedArgsArray', $passedArgsArray);
$this->BlockList->index($this->_isRest(), $params); return $this->BlockList->index($this->_isRest(), $params);
} }
public function add() public function add()
{ {
$this->BlockList->add($this->_isRest());
$this->set('action', 'add'); $this->set('action', 'add');
return $this->BlockList->add($this->_isRest());
} }
public function edit($id) public function edit($id)
{ {
$this->BlockList->edit($this->_isRest(), $id);
$this->set('action', 'edit'); $this->set('action', 'edit');
$this->render('add'); return $this->BlockList->edit($this->_isRest(), $id);
} }
public function delete($id) public function delete($id)
@ -61,7 +60,7 @@ class GalaxyClusterBlocklistsController extends AppController
} }
$id = $entry['GalaxyClusterBlocklist']['id']; $id = $entry['GalaxyClusterBlocklist']['id'];
} }
$this->BlockList->delete($this->_isRest(), $id); return $this->BlockList->delete($this->_isRest(), $id);
} }
public function massDelete() public function massDelete()

1
app/Model/GalaxyClusterBlocklist.php
View File

@ -16,6 +16,7 @@ class GalaxyClusterBlocklist extends AppModel
); );
public $blocklistFields = array('cluster_uuid', 'comment', 'cluster_info', 'cluster_orgc'); public $blocklistFields = array('cluster_uuid', 'comment', 'cluster_info', 'cluster_orgc');
public $blocklistTarget = 'cluster';
public $validate = array( public $validate = array(
'cluster_uuid' => array( 'cluster_uuid' => array(