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 feature-report-from-event

pull/6590/head
mokaddem 2020-11-17 13:35:40 +01:00
parent 9135a1ca8d eb4f739b7e
commit c8462c5791
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Lib/Export/TextExport.php
View File

@ -3,7 +3,8 @@
class TextExport
{
public $additional_params = array(
'flatten' => 1
'flatten' => 1,
'group' => 'Attribute.value'
);
public function handler($data, $options = array())

2
app/Model/Attribute.php
View File

@ -3439,7 +3439,7 @@ class Attribute extends AppModel
$params['conditions']['AND']['(Attribute.deleted + 0)'] = $options['deleted'];
}
if (isset($options['group'])) {
$params['group'] = empty($options['group']) ? $options['group'] : false;
$params['group'] = !empty($options['group']) ? $options['group'] : false;
}
// Site admin can access even unpublished event attributes if `unpublishedprivate` option is enabled
if (!$user['Role']['perm_site_admin'] && Configure::read('MISP.unpublishedprivate')) {

2
app/Model/MispObject.php
View File

@ -361,7 +361,7 @@ class MispObject extends AppModel
} else {
foreach ($templateFields as $k => $v) {
if (!isset($object['Object'][$k])) {
return 'No valid template found and object lacking template information. (' . $k . ')';
return array('template' => array(__('No valid template found and object lacking template information. (%s)', $k)));
}
}
}

2
app/files/warninglists

@ -1 +1 @@
Subproject commit a80da878b911e3633d88e576323e8cfec7f83e13
Subproject commit d4ca35c25c7431f0696ab4b2289b2901b0c3f4c2