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

Merge pull request #6727 from JakubOnderka/fix-toggle-url 

fix: [UI] Toggle doesn't work with absolute URLs
pull/6732/head
Jakub Onderka 2020-12-09 22:23:35 +01:00 committed by GitHub
parent a4afe1cf31 260a3a37b0
commit 976591972a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/View/Elements/genericElements/IndexTable/Fields/toggle.ctp
View File

@ -20,8 +20,8 @@
);
?>
<script type="text/javascript">
$(document).ready(function() {
var url = baseurl + "<?= h($field['url']) ?>";
$(function() {
var url = "<?= h($field['url']) ?>";
<?php
if (!empty($field['url_params_data_paths'][0])) {
$id = Hash::extract($row, $field['url_params_data_paths'][0]);
@ -35,12 +35,13 @@ $(document).ready(function() {
}
?>
$.ajax({
type:"get",
type: "get",
url: url,
error:function() {
showMessage('fail', '<?= __('Could not retrieve current state.') ?>.');
error: function() {
showMessage('fail', '<?= __('Could not retrieve current state.') ?>');
$('#<?= $checkboxId ?>').prop("checked", false);
},
success: function (data, textStatus) {
success: function (data) {
$('#<?= $tempboxId ?>').html(data);
// Make @mokaddem aka Graphman happy
var $form = $('#<?= $tempboxId ?>').find('form');
@ -49,13 +50,14 @@ $(document).ready(function() {
cache: false,
type:"post",
url: $form.attr('action'),
success:function(data, textStatus) {
showMessage('success', '<?= __('Field updated.') ?>.');
success: function() {
showMessage('success', '<?= __('Field updated.') ?>');
},
error:function() {
showMessage('fail', '<?= __('Could not update field.') ?>.');
error: function() {
showMessage('fail', '<?= __('Could not update field.') ?>');
$('#<?= $checkboxId ?>').prop("checked", false);
},
complete:function() {
complete: function() {
$('#<?= $tempboxId ?>').empty();
<?php
if (!empty($field['afterHook'])) {