mirror of https://github.com/MISP/MISP
chg: [attribute] rearranging fixed
parent
b78d73ac0f
commit
afbe08d256
|
@ -1705,7 +1705,14 @@ class Attribute extends AppModel
|
||||||
if (empty($options['flatten'])) {
|
if (empty($options['flatten'])) {
|
||||||
$params['conditions']['AND'][] = array('Attribute.object_id' => 0);
|
$params['conditions']['AND'][] = array('Attribute.object_id' => 0);
|
||||||
}
|
}
|
||||||
$params['order'] = isset($options['order']) ? $options['order'] : [];
|
$params['order'] = [];
|
||||||
|
if (!empty($options['order'])) {
|
||||||
|
$options['order'] = $this->findOrder(
|
||||||
|
$options['order'],
|
||||||
|
'Attribute',
|
||||||
|
['id', 'event_id', 'object_id', 'type', 'category', 'value', 'distribution', 'timestamp', 'object_relation']
|
||||||
|
);
|
||||||
|
}
|
||||||
if (!isset($options['withAttachments'])) {
|
if (!isset($options['withAttachments'])) {
|
||||||
$options['withAttachments'] = false;
|
$options['withAttachments'] = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue