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

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

pull/7535/head
Alexandre Dulaunoy 2021-07-01 17:36:12 +02:00
parent 24bcc09980 75512c557e
commit 5568da12ba
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/GalaxyClustersController.php
View File

@ -323,6 +323,7 @@ class GalaxyClustersController extends AppController
}
}
}
$this->set('galaxy', ['Galaxy' => ['id' => $galaxyId]]);
$this->set('galaxy_id', $galaxyId);
$this->set('distributionLevels', $distributionLevels);
$this->set('initialDistribution', $initialDistribution);

2
app/View/Elements/genericElements/SideMenu/side_menu.ctp
View File

@ -1378,7 +1378,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'text' => __('Import Galaxy Clusters')
));
}
if ($menuItem === 'view' || $menuItem === 'export' || $menuItem === 'view_cluster') {
if ($menuItem === 'view' || $menuItem === 'export' || $menuItem === 'view_cluster' || $menuItem === 'add_cluster') {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'export',
'url' => $baseurl . '/galaxies/export/' . h($galaxy['Galaxy']['id']),