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

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/9715/head
iglocska 2024-04-23 15:12:30 +02:00
parent b6a8d43bbd d629922a7f
commit 89a6cbdfe6
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/GalaxyClustersController.php
View File

@ -59,6 +59,8 @@ class GalaxyClustersController extends AppController
$contextConditions['GalaxyCluster.default'] = true;
} elseif ($filters['context'] == 'custom') {
$contextConditions['GalaxyCluster.default'] = false;
} elseif ($filters['context'] == 'orgc') {
$contextConditions['GalaxyCluster.orgc_id'] = $this->Auth->user('org_id');
} elseif ($filters['context'] == 'org') {
$contextConditions['GalaxyCluster.org_id'] = $this->Auth->user('org_id');
} elseif ($filters['context'] == 'deleted') {

2
app/View/GalaxyClusters/ajax/index.ctp
View File

@ -34,7 +34,7 @@
),
array(
'active' => $context === 'org',
'url' => sprintf('%s/galaxies/view/%s/context:org', $baseurl, $galaxy_id),
'url' => sprintf('%s/galaxies/view/%s/context:orgc', $baseurl, $galaxy_id),
'text' => __('My Clusters'),
),
array(