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

fix: [bug] Fixed bug with stacking login screens ontop of an event view

pull/3826/head
iglocska 2018-10-29 19:31:07 +01:00
parent d652927261
commit ef2920d953
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -46,7 +46,7 @@ class AppController extends Controller
public $helpers = array('Utility', 'OrgImg');
private $__queryVersion = '46';
private $__queryVersion = '47';
public $pyMispVersion = '2.4.96';
public $phpmin = '5.6.5';
public $phprec = '7.0.16';

2
app/Controller/EventsController.php
View File

@ -5050,7 +5050,7 @@ class EventsController extends AppController
$this->layout = false;
$this->render('/Events/ajax/event_lock');
} else {
return $this->RestResponse->viewData(array(), $this->response->type());
return $this->RestResponse->viewData('', $this->response->type());
}
}

16
app/webroot/js/misp.js
View File

@ -3447,11 +3447,19 @@ $(document).ready(function() {
function queryEventLock(event_id, user_org_id) {
if (tabIsActive) {
$.get( "/events/checkLocks/" + event_id, function(data) {
if ($('#event_lock_warning').length != 0) {
$('#event_lock_warning').remove();
$.ajax({
url: "/events/checkLocks/" + event_id,
type: "get",
success: function(data, statusText, xhr) {
if (xhr.status == 200) {
if ($('#event_lock_warning').length != 0) {
$('#event_lock_warning').remove();
}
if (data.startsWith('Warning:')) {
$('#main-view-container').append(data);
}
}
}
$('#main-view-container').append(data);
});
}
setTimeout(function() { queryEventLock(event_id, user_org_id); }, 5000);