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

Merge pull request #6234 from JakubOnderka/event-filters-fix 

fix: [UI] Event attribute filters works again
pull/6237/head
Jakub Onderka 2020-08-25 18:44:38 +02:00 committed by GitHub
parent eee0b7846e 9dbf016e0a
commit 5da022f219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Elements/eventattribute.ctp
View File

@ -1,5 +1,5 @@
<?php
$urlHere = Router::url(null, true);
$urlHere = Router::url(null);
$urlHere = explode('/', $urlHere);
foreach ($urlHere as $k => $v) {
$urlHere[$k] = urlencode($v);

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

@ -3616,7 +3616,7 @@ function syncUserSelected() {
}
function filterAttributes(filter, id) {
url = baseurl + "/events/viewEventAttributes/" + id;
var url = baseurl + "/events/viewEventAttributes/" + id;
if(filter === 'value'){
filter = encodeURIComponent($('#quickFilterField').val().trim());
url += filter.length > 0 ? "/searchFor:" + filter : "";
@ -3627,8 +3627,8 @@ function filterAttributes(filter, id) {
}
if (deleted) url += '/deleted:true';
$.ajax({
type:"get",
url:url,
type: "get",
url: url,
beforeSend: function (XMLHttpRequest) {
$(".loading").show();
},
@ -3650,12 +3650,14 @@ function pivotObjectReferences(url, uuid) {
beforeSend: function (XMLHttpRequest) {
$(".loading").show();
},
success:function (data) {
success: function (data) {
$("#attributes_div").html(data);
$(".loading").hide();
},
error:function() {
error: function() {
showMessage('fail', 'Something went wrong - could not fetch attributes.');
},
complete: function() {
$(".loading").hide();
}
});
}
@ -3690,15 +3692,18 @@ function toggleBoolFilter(url, param) {
url += buildFilterURL(res);
url = url.replace(/view\//i, 'viewEventAttributes/');
$.ajax({
type:"get",
url:url,
beforeSend: function (XMLHttpRequest) {
type: "get",
url: url,
beforeSend: function () {
$(".loading").show();
},
complete: function () {
$(".loading").hide();
},
success:function (data) {
$("#attributes_div").html(data);
querybuilderTool = undefined;
$(".loading").hide();
},
error:function() {
showMessage('fail', 'Something went wrong - could not fetch attributes.');