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

chg: [server:rest] Query builder gets loaded with body after the POST 

fix #5680
pull/5687/head
mokaddem 2020-03-06 11:24:13 +01:00
parent 4f3ed331f0
commit 9bab7d8217
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/webroot/js/restClient.js
View File

@ -129,6 +129,7 @@ function removeRestClientHistoryItem(id) {
} }
}); });
$('#TemplateSelect').val($('#ServerUrl').val()).trigger("chosen:updated").trigger("change");
$('#ServerUrl').keyup(function() { $('#ServerUrl').keyup(function() {
$('#TemplateSelect').val($(this).val()).trigger("chosen:updated").trigger("change"); $('#TemplateSelect').val($(this).val()).trigger("chosen:updated").trigger("change");
}); });
@ -142,11 +143,12 @@ function removeRestClientHistoryItem(id) {
$('#ServerUrl').val(allValidApis[selected_template].url); $('#ServerUrl').val(allValidApis[selected_template].url);
$('#ServerUrl').data('urlWithoutParam', selected_template); $('#ServerUrl').data('urlWithoutParam', selected_template);
var body_value = $('#ServerBody').val(); var body_value = $('#ServerBody').val();
if (body_value === '' || server_url_changed) { var refreshBody = (body_value === '' || server_url_changed)
if (refreshBody) {
$('#ServerBody').val(allValidApis[selected_template].body); $('#ServerBody').val(allValidApis[selected_template].body);
} }
setApiInfoBox(false); setApiInfoBox(false);
updateQueryTool(selected_template, true); updateQueryTool(selected_template, refreshBody);
} }
}); });
@ -294,8 +296,10 @@ function updateQueryTool(url, isEmpty) {
}); });
} else { } else {
var r = filtersJson[k]; var r = filtersJson[k];
r.value = values; if (r !== undefined) { // rule is not defined in the description
rules.rules[0].rules.push(r); r.value = values;
rules.rules[0].rules.push(r);
}
} }
}); });
@ -313,7 +317,6 @@ function updateQueryTool(url, isEmpty) {
+ '</div>'); + '</div>');
div.append(additionalInput); div.append(additionalInput);
} }
querybuilderTool.setRules(rules, false); querybuilderTool.setRules(rules, false);
} }