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

chg: [UI] View graph cleanup

pull/8319/head
Jakub Onderka 2022-05-02 09:50:22 +02:00
parent 3a8ce98189
commit 5207d2c072
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controller/EventsController.php
View File

@ -4643,18 +4643,16 @@ class EventsController extends AppController
public function viewGraph($id)
{
// Event data are fetched by 'updateGraph', here we need just metadata.
$event = $this->Event->fetchEvent($this->Auth->user(), array(
'eventid' => $id,
'metadata' => true,
));
$event = $this->Event->fetchSimpleEvent($this->Auth->user(), $id);
if (empty($event)) {
throw new NotFoundException(__('Invalid Event.'));
}
$this->set('event', $event[0]);
$this->set('event', $event);
$this->set('scope', 'event');
$this->set('id', $id);
$this->set('mayModify', $this->__canModifyEvent($event));
$this->set('mayPublish', $this->__canPublishEvent($event));
$this->set('id', $event['Event']['id']);
}
/*

28
app/View/Events/view_graph.ctp
View File

@ -1,13 +1,7 @@
<?php
if ($scope == 'event') {
$mayModify = (($isAclModify && $event['Event']['user_id'] == $me['id'] && $event['Orgc']['id'] == $me['org_id']) || ($isAclModifyOrg && $event['Orgc']['id'] == $me['org_id']));
$mayPublish = ($isAclPublish && $event['Orgc']['id'] == $me['org_id']);
}
echo $this->Html->css('font-awesome');
echo $this->Html->css('correlation-graph');
echo $this->Html->script('d3');
echo $this->Html->script('correlation-graph');
echo $this->Html->script('font-awesome-helper');
<?= $this->element('genericElements/assetLoader', [
'css' => ['font-awesome', 'correlation-graph'],
'js' => ['d3', 'correlation-graph', 'font-awesome-helper'],
]);
?>
<?php
if (!$ajax):
@ -17,20 +11,20 @@
<span id="fullscreen-btn-correlation" class="fullscreen-btn-correlation btn btn-xs btn-primary" data-toggle="tooltip" data-placement="top" data-title="<?php echo __('Toggle fullscreen');?>"><span class="fa fa-desktop"></span></span>
<div id="chart" style="width:100%;height:100%"></div>
<div id="hover-menu-container" class="menu-container">
<span class="bold hidden" id="hover-header"><?php echo __('Hover target');?></span><br />
<span class="bold hidden" id="hover-header"><?php echo __('Hover target');?></span><br>
<ul id="hover-menu" class="menu">
</ul>
</div>
<div id="selected-menu-container" class="menu-container">
<span class="bold hidden" id="selected-header"><?php echo __('Selected');?></span><br />
<ul id = "selected-menu" class="menu">
<span class="bold hidden" id="selected-header"><?php echo __('Selected');?></span><br>
<ul id="selected-menu" class="menu">
</ul>
</div>
<ul id="context-menu" class="menu">
<li id="expand"><?php echo __('Expand');?></li>
<li id="context-delete"><?php echo __('Delete');?></li>
</ul>
<button class="correlation-stop-btn btn btn-inverse" onClick="togglePhysics();" title="<?php echo __('Toggle the physics engine on/off.');?> ">Toggle physics</button>
<button class="correlation-stop-btn btn btn-inverse" onclick="togglePhysics();" title="<?php echo __('Toggle the physics engine on/off.');?>">Toggle physics</button>
<?php
if (!$ajax):
?>
@ -48,11 +42,10 @@
'menuList' => $scope_list[$scope],
'menuItem' => 'viewGraph'
);
if ($scope == 'event') {
if ($scope === 'event') {
$params['mayModify'] = $mayModify;
$params['mayPublish'] = $mayPublish;
}
if ($scope == 'tag') {
} else if ($scope === 'tag') {
if (!empty($taxoomy)) {
$params['taxonomy'] = $taxonomy['Taxonomy']['id'];
}
@ -61,4 +54,3 @@
if (!$ajax) {
echo $this->element('/genericElements/SideMenu/side_menu', $params);
}
?>