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

fix: Support is isSiteAdmin + undeclared var + z-index

pull/3063/head
Sami Mokaddem 2018-03-22 08:46:54 +00:00
parent 9e4af28b71
commit fc6301dc6b
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Events/view.ctp
View File

@ -355,7 +355,7 @@
<span class="fullscreen-btn btn btn-xs btn-primary" data-toggle="tooltip" data-placement="top" data-title="<?php echo __('Toggle fullscreen');?>"><span class="fa fa-desktop"></span></span>
<input type="text" id="network-typeahead" class="network-typeahead" data-provide="typeahead" size="20" placeholder="Search for an item">
<div id="eventgraph_network" class="eventgraph_network" data-event-id="<?php echo h($event['Event']['id']); ?>" data-user-manipulation="<?php echo h($mayModify) ? 'true' : 'false'; ?>"></div>
<div id="eventgraph_network" class="eventgraph_network" data-event-id="<?php echo h($event['Event']['id']); ?>" data-user-manipulation="<?php echo $mayModify || $isSiteAdmin ? 'true' : 'false'; ?>"></div>
<div class="loading-network-div" id="refecences_network_loading_div" style="display: none;">
<div class="spinner-network" data-original-title="" title="" style="display: none;"></div>
<div class="progress progressbar-network-div" >

4
app/webroot/css/main.css
View File

@ -432,6 +432,7 @@ dd {
bottom:0px;
height:42px;
min-width:1300px;
z-index: 2;
}
.debugOff {
@ -500,7 +501,7 @@ dd {
/* header */
.header {
width:100%;
z-index: 1;
z-index: 2;
}
/* fonts for logo */
@ -555,7 +556,6 @@ dd {
position: absolute;
width:100%;
text-align:center;
z-index:1;
}
.privateRedText {

2
app/webroot/css/references-graph.css
View File

@ -109,6 +109,6 @@
.network-typeahead {
position: absolute;
right: 2px;
right: 20px;
z-index: 1;
}

5
app/webroot/js/references-graph.js
View File

@ -14,7 +14,6 @@ var typeaheadData;
var scope_id = $('#eventgraph_network').data('event-id');
var container = document.getElementById('eventgraph_network');
var user_manipulation = $('#eventgraph_network').data('user-manipulation');
var user_manipulation = true;
/*=========
* CLASSES
@ -357,7 +356,7 @@ class DataHandler {
}
// misp interaction class (handle interaction with misp)
// MISP interaction class (handle interaction with misp)
class MispInteraction {
constructor(nodes, edges) {
this.nodes = nodes;
@ -365,7 +364,7 @@ class MispInteraction {
}
remove_reference(edgeData, callback) {
edge_id = edgeData.edges[0];
var edge_id = edgeData.edges[0];
var fromto = edge_id;
var relation_id = dataHandler.mapping_fromto_to_rel_id.get(fromto);
deleteObject('object_references', 'delete', relation_id, scope_id);