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

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/9440/head
Christian Studer 2023-12-14 11:42:43 +01:00
parent debae13bc2 618dbb64cf
commit 472cfab3c7
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Model/EventReport.php
View File

@ -153,8 +153,12 @@ class EventReport extends AppModel
{
$errors = array();
if (!isset($report['EventReport']['uuid'])) {
$errors[] = __('Event Report doesn\'t have an UUID');
return $errors;
if ($fromPull) {
$report['EventReport']['uuid'] = $attribute['uuid'] = CakeText::uuid();
} else {
$errors[] = __('Event Report doesn\'t have an UUID');
return $errors;
}
}
$report['EventReport']['event_id'] = $eventId;
$existingReport = $this->find('first', array(

12
app/View/Users/admin_edit.ctp
View File

@ -52,6 +52,18 @@
echo $this->Form->input('confirm_password', array('type' => 'password', 'div' => array('class' => 'input password required')));
?>
</div>
<?php
$isTotp = isset($this->request->data['User']['totp']) ? true : false;
if ($isTotp) {
echo sprintf(
'<div class="clear"><span role="button" tabindex="0" aria-label="%s" onclick="openGenericModal(\'%s/users/totp_delete/%s\')" class="btn btn-inverse" style="margin-bottom:10px;">%s</span></div>',
__('Delete TOTP token'),
h($baseurl),
h($this->request->data['User']['id']),
__('Delete TOTP token')
);
}
?>
</div>
<div class="clear"></div>
<?php

3
app/webroot/js/event-graph.js
View File

@ -95,6 +95,9 @@ class EventGraph {
// });
});
this.network.on("doubleClick", function (params) {
eventGraph.expand_node(params.nodes[0]);
});
this.network.on("dragStart", function (params) {
eventGraph.physics_state(false);
eventGraph.physics_activate_physics_for_nodes(params.nodes);

2
app/webroot/js/workflows-editor/workflows-editor.js
View File

@ -1132,7 +1132,7 @@ function mergeNodeAndModuleFilters(node, moduleFilters) {
/* API */
function fetchWorkflow(id, callback) {
var url = '/workflows/view/' + id + '.json'
var url = baseurl + '/workflows/view/' + id + '.json'
$.ajax({
beforeSend: function () {
toggleEditorLoading(true, 'Loading workflow')