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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/7377/head v2.4.142
iglocska 2021-04-27 10:53:41 +02:00
parent d61ebc9905 43b0f8d9b6
commit b14b85a781
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/View/Correlations/top.ctp
View File

@ -74,11 +74,4 @@
echo $this->element('/genericElements/SideMenu/side_menu', $menuData);
}
?>
<script type="text/javascript">
var passedArgsArray = <?php echo $passedArgs; ?>;
$(function() {
$('#quickFilterButton').click(function() {
runIndexQuickFilter();
});
});
</script>

21
app/View/Elements/genericElements/IndexTable/Fields/postlink.ctp
View File

@ -37,16 +37,25 @@
'id' => 'form-' . $randomId,
'url' => $baseurl . $url,
]);
foreach ($fieldsArray as $field => $value) {
$form .= $this->Form->input($field, ['value' => $value]);
foreach ($fieldsArray as $inputField => $value) {
$form .= $this->Form->input($inputField, ['value' => $value]);
}
$form .= $this->Form->end();
$onclick = sprintf(
'$(\'#form-%s\').submit();',
$randomId
);
if (!empty($field['confirm_post'])) {
$field['confirm_message'] = !empty($field['confirm_message']) ? $field['confirm_message'] : __('Confirm action?');
$onclick = sprintf(
'%s ? $(\'#form-%s\').submit() : \'\';',
sprintf('confirm(\'%s\')', h($field['confirm_message'])),
$randomId
);
}
echo sprintf(
'%s<a href="#" onClick="event.preventDefault(); %s">%s</a>',
$form,
sprintf(
'$(\'#form-%s\').submit();',
$randomId
),
$onclick,
$text
);