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

fix: [Galaxy] Various fixes to blocking issues with the galaxy update system, fixes #3773

pull/3778/head
iglocska 2018-10-17 20:59:51 +02:00
parent 9057123d6d
commit 35fabbe7f6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/GalaxiesController.php
View File

@ -34,7 +34,9 @@ class GalaxiesController extends AppController
}
if (!empty($this->params['named']['force'])) {
$force = 1;
}
} else {
$force = 0;
}
$result = $this->Galaxy->update($force);
$message = 'Galaxies updated.';
if ($this->_isRest()) {

6
app/Model/Galaxy.php
View File

@ -106,8 +106,7 @@ class Galaxy extends AppModel
// Delete all existing outdated clusters
foreach ($cluster_package['values'] as $k => $cluster) {
if (empty($cluster['value'])) {
debug($cluster);
throw new Exception();
continue;
}
if (isset($cluster['version'])) {
} elseif (!empty($cluster_package['version'])) {
@ -130,6 +129,9 @@ class Galaxy extends AppModel
// create all clusters
foreach ($cluster_package['values'] as $cluster) {
if (empty($cluster['version'])) {
$cluster['version'] = 1;
}
$template['version'] = $cluster['version'];
$this->GalaxyCluster->create();
$cluster_to_save = $template;