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

Merge pull request #6228 from JakubOnderka/fix-6226 

fix: [JS] Issue #6226 when adding object reference
pull/6230/head
Jakub Onderka 2020-08-24 12:30:02 +02:00 committed by GitHub
parent 0069c2882a 6bc7e63bc8
commit b361dc1ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1254,21 +1254,22 @@ function submitPopoverForm(context_id, referer, update_context_id, modal, popove
closePopover = false;
break;
case 'addObjectReference':
url = baseurl + "/objectReferences/add/" + context_id;
break;
case 'quickAddAttributeForm':
url = baseurl + "/objects/quickAddAttributeForm/" + context_id;
break;
case 'acceptUserRegistrations':
url = baseurl + "/users/acceptRegistrations/" + context_id
// nothing to change
break;
}
if ($("#submitButton").parent().hasClass('modal-footer')) {
var $form = $("#submitButton").parent().parent().find('.modal-body form');
url = baseurl + $form.attr('action');
var $submitButton = $("#submitButton");
if ($submitButton.parent().hasClass('modal-footer')) {
var $form = $submitButton.parent().parent().find('.modal-body form');
url = $form.attr('action');
} else {
var $form = $("#submitButton").closest("form");
url = baseurl + $form.attr('action');
var $form = $submitButton.closest("form");
url = $form.attr('action');
}
// Prepend URL with baseurl if URL is relative
if (!url.startsWith('http')) {
url = baseurl + url;
}
$.ajax({
beforeSend: function (XMLHttpRequest) {
@ -1288,7 +1289,7 @@ function submitPopoverForm(context_id, referer, update_context_id, modal, popove
}
},
data: $form.serialize(),
success:function (data, textStatus) {
success: function (data, textStatus) {
var result;
if (closePopover) {
if (modal) {
@ -1326,7 +1327,7 @@ function submitPopoverForm(context_id, referer, update_context_id, modal, popove
url: url,
});
return false;
};
}
function handleAjaxModalResponse(response, context_id, url, referer, context, contextNamingConvention) {
responseArray = response;