mirror of https://github.com/MISP/MISP
Merge branch '2.4' of github.com:MISP/MISP into 2.4
commit
5568da12ba
|
@ -323,6 +323,7 @@ class GalaxyClustersController extends AppController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$this->set('galaxy', ['Galaxy' => ['id' => $galaxyId]]);
|
||||||
$this->set('galaxy_id', $galaxyId);
|
$this->set('galaxy_id', $galaxyId);
|
||||||
$this->set('distributionLevels', $distributionLevels);
|
$this->set('distributionLevels', $distributionLevels);
|
||||||
$this->set('initialDistribution', $initialDistribution);
|
$this->set('initialDistribution', $initialDistribution);
|
||||||
|
|
|
@ -1378,7 +1378,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
|
||||||
'text' => __('Import Galaxy Clusters')
|
'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(
|
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
|
||||||
'element_id' => 'export',
|
'element_id' => 'export',
|
||||||
'url' => $baseurl . '/galaxies/export/' . h($galaxy['Galaxy']['id']),
|
'url' => $baseurl . '/galaxies/export/' . h($galaxy['Galaxy']['id']),
|
||||||
|
|
Loading…
Reference in New Issue