diff --git a/web/ajax/modals/objdetect.php b/web/ajax/modals/objdetect.php new file mode 100644 index 000000000..8ffa7e3d9 --- /dev/null +++ b/web/ajax/modals/objdetect.php @@ -0,0 +1,29 @@ + + diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js index cabcc76ce..ea3247f29 100644 --- a/web/skins/classic/views/js/events.js +++ b/web/skins/classic/views/js/events.js @@ -61,7 +61,7 @@ function processRows(rows) { if ( canEdit.Monitors ) row.Monitor = '' + row.Monitor + ''; if ( canEdit.Events ) row.Cause = '' + row.Cause + ''; if ( row.Notes.indexOf('detected:') >= 0 ) { - row.Cause = row.Cause + '
' + row.Notes + '
'; + row.Cause = row.Cause + '' + row.Notes + ''; } else if ( row.Notes != 'Forced Web: ' ) { row.Cause = row.Cause + '
' + row.Notes + '
'; } @@ -141,6 +141,17 @@ function getEventDetailModal(eid) { .fail(logAjaxFail); } +function objdetectModal( element ) { + var eid = element.getAttribute('data-event-id'); + + $j.getJSON(thisUrl + '?request=modal&modal=objdetect&eid=' + eid) + .done(function(data) { + insertModalHtml('objdetectModal', data.html); + $j('#objdetectModal').modal('show'); + }) + .fail(logAjaxFail); +} + function initPage() { // Remove the thumbnail column from the DOM if thumbnails are off globally if ( !WEB_LIST_THUMBS ) $j('th[data-field="Thumbnail"]').remove(); @@ -303,6 +314,8 @@ function initPage() { // Update table links each time after new data is loaded table.on('post-body.bs.table', function(data) { + // Object detection inserts data-onclick-this links after DOM has loaded + dataOnClickThis(); // Manage the eventdetail links in the events list $j(".eDetailLink").click(function(evt) { evt.preventDefault();