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

fix: [galaxyCluster] Integrated changes of improved index factory

pull/6686/head
mokaddem 2020-12-01 15:58:57 +01:00
parent b1d96297f3
commit a2b3504c42
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/GalaxyClustersController.php
View File

@ -56,7 +56,7 @@ class GalaxyClustersController extends AppController
$contextConditions['GalaxyCluster.deleted'] = true;
}
$this->set('passedArgsArray', array('context' => $filters['context'], 'searchall' => isset($filters['searchall']) ? $filters['searchall'] : ''));
$this->set('passedArgs', json_encode(array('context' => $filters['context'], 'searchall' => isset($filters['searchall']) ? $filters['searchall'] : '')));
$this->set('context', $filters['context']);
$searchConditions = array();
if (empty($filters['searchall'])) {
@ -984,6 +984,7 @@ class GalaxyClustersController extends AppController
),
'contain' => array('SharingGroup', 'TargetCluster', 'GalaxyClusterRelationTag' => array('Tag'))
));
$this->set('passedArgs', json_encode([]));
$this->set('relations', $relations);
$this->set('tree', $tree);
$this->loadModel('Attribute');

1
app/Controller/GalaxyElementsController.php
View File

@ -39,6 +39,7 @@ class GalaxyElementsController extends AppController
$this->set('elements', $elements);
$this->set('clusterId', $clusterId);
$this->set('context', $filters['context']);
$this->set('passedArgs', json_encode(array('context' => $filters['context'], 'searchall' => isset($filters['searchall']) ? $filters['searchall'] : '')));
$cluster = $this->GalaxyElement->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $clusterId, array('edit', 'delete'), false, false);
$canModify = !empty($cluster['authorized']);
$canModify = true;

1
app/View/GalaxyClusters/view_relations.ctp
View File

@ -48,7 +48,6 @@
'element' => 'distribution_levels',
),
),
'title' => __('Galaxy Cluster Relationships'),
'actions' => array(
array(
'title' => 'Edit',