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

Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0

pull/6120/head
mokaddem 2020-07-15 16:12:08 +02:00
parent b9b08ae17e 88806caca4
commit 8818519981
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/GalaxyClustersController.php
View File

@ -823,7 +823,7 @@ class GalaxyClustersController extends AppController
),
'fields' => array('Tag.name, COUNT(DISTINCT event_id) as tag_count'),
'recursive' => -1,
'group' => array('Tag.name')
'group' => array('Tag.name', 'Tag.id')
));
// fetch all related tags belonging to attack pattern or belonging to an event having this cluster
@ -838,7 +838,7 @@ class GalaxyClustersController extends AppController
),
'fields' => array('Tag.name, COUNT(DISTINCT event_id) as tag_count'),
'recursive' => -1,
'group' => array('Tag.name')
'group' => array('Tag.name', 'Tag.id')
));
$scores = array();

2
app/Controller/UserSettingsController.php
View File

@ -342,7 +342,7 @@ class UserSettingsController extends AppController
)
);
$result = $this->UserSetting->setSetting($this->Auth->user(), $setting);
return $this->RestResponse->saveSuccessResponse('UserSettings', 'setHomePage', false, $this->response->type(), 'Homepage set to ' . $this->request->data['path']);
return $this->RestResponse->saveSuccessResponse('UserSettings', 'setHomePage', false, 'json', 'Homepage set to ' . $this->request->data['path']);
} else {
$this->layout = false;
}

2
app/View/Attributes/ajax/attributeEditMassForm.ctp
View File

@ -36,7 +36,7 @@
echo $this->Form->input('is_proposal', array(
'type' => 'checkbox',
'label' => __('Create proposals'),
'checked' => true
'checked' => false
));
?>
<div class="input clear"></div>

6
app/View/Events/add.ctp
View File

@ -65,7 +65,11 @@
)
)
));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => $action === 'add' ? 'add' : 'editEvent'));
echo $this->element('/genericElements/SideMenu/side_menu', array(
'menuList' => $action === 'add' ? 'event-collection' : 'event',
'menuItem' => $action === 'add' ? 'add' : 'editEvent',
'event' => isset($event) ? $event : null,
));
?>
<script type="text/javascript">