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

chg: [UI] Remove onclick when adding tag

pull/8248/head
Jakub Onderka 2022-03-29 17:17:48 +02:00
parent b7d7fd8f28
commit 9b9e332019
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/View/Elements/ajaxTags.ctp
View File

@ -107,35 +107,23 @@
$buttonData = array();
if ($full) {
$buttonData[] = sprintf(
'<button title="%s" role="button" tabindex="0" aria-label="%s" class="%s" style="%s" onClick="%s">%s</button>',
'<button title="%s" role="button" tabindex="0" aria-label="%s" class="%s" style="%s" data-popover-popup="%s">%s</button>',
__('Add a tag'),
__('Add a tag'),
'addTagButton btn btn-inverse noPrint',
'line-height:10px; padding: 2px;',
sprintf(
"popoverPopup(this, '%s%s', '%s', '%s');",
$id,
($scope === 'event') ? '' : ('/' . $scope),
'tags',
'selectTaxonomy'
),
$baseurl . '/tags/selectTaxonomy/' . $id . ($scope === 'event') ? '' : ('/' . $scope),
'<i class="fas fa-globe-americas"></i> +'
);
}
if ($full || $fullLocal) {
$buttonData[] = sprintf(
'<button title="%s" role="button" tabindex="0" aria-label="%s" class="%s" style="%s" onClick="%s">%s</button>',
'<button title="%s" role="button" tabindex="0" aria-label="%s" class="%s" style="%s" data-popover-popup="%s">%s</button>',
__('Add a local tag'),
__('Add a local tag'),
'addLocalTagButton btn btn-inverse noPrint',
'line-height:10px; padding: 2px;',
sprintf(
"popoverPopup(this, '%s%s', '%s', '%s')",
$id,
($scope === 'event') ? '' : ('/' . $scope),
'tags',
'selectTaxonomy/local:1'
),
$baseurl . '/tags/selectTaxonomy/local:1/' . $id . ($scope === 'event') ? '' : ('/' . $scope),
'<i class="fas fa-user"></i> +'
);
}
@ -181,4 +169,3 @@
$tagConflictData .= '</div></div></span>';
}
echo $tagConflictData;
?>

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

@ -4779,6 +4779,12 @@ $(document.body).on('click', 'a.modal-open', function (e) {
openGenericModal($(this).attr('href'));
});
$(document.body).on('click', '[data-popover-popup]', function (e) {
e.preventDefault();
var url = $(this).data('popover-popup');
popoverPopup(this, url);
});
function queryEventLock(event_id, timestamp) {
if (!document.hidden) {
$.ajax({