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

not local and no uuid, it's an invalid organisation 

sync fails with
[2016-06-01 21:04:26] main.ERROR: {"queue":"default","id":"99b7d5ef61e24389ea2edf8c3f209856","class":"ServerShell","args":[["pull","1","1","full","2075"]]} failed: SQLSTATE[HY000]: General error: 1364 Field 'uuid' doesn't have a default value {"type":"fail","log":"SQLSTATE[HY000]: General error: 1364 Field 'uuid' doesn't have a default value","job_id":"99b7d5ef61e24389ea2edf8c3f209856","time":55606,"worker":"misp:14872"} []
pull/1202/head
Steve Fossen 2016-06-03 10:43:09 -07:00
parent 6e9a448cbd
commit e54b74551f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/Organisation.php
View File

@ -88,6 +88,7 @@ class Organisation extends AppModel{
if (empty($this->data['Organisation']['uuid']) && (isset($this->data['Organisation']['local']) && $this->data['Organisation']['local'])) {
$this->data['Organisation']['uuid'] = $this->generateUuid();
}
if (empty($this->data['Organisation']['uuid'])) return false;
$date = date('Y-m-d H:i:s');
if (!isset($this->data['Organisation']['date_created']) || empty($this->data['Organisation']['date_created'])) $this->data['Organisation']['date_created'] = $date;
$this->data['Organisation']['date_modified'] = $date;
@ -245,4 +246,4 @@ class Organisation extends AppModel{
$logFile->close();
return $success;
}
}
}