Skip to content

Commit ce84a92

Browse files
committed
CleanUp some debug
1 parent c6ed0e3 commit ce84a92

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

application/libraries/Grocery_CRUD.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,7 @@ protected function showListInfo()
19251925

19261926
$draw = isset($_REQUEST['draw']) ? intval($_REQUEST['draw']) : 0;
19271927
@ob_end_clean();
1928-
echo json_encode(array('back' => $_REQUEST, 'total_results' => $total_results, "draw" => $draw, 'recordsTotal' => $total_results, 'recordsFiltered' => $filter_results, 'data' => $list));
1928+
echo json_encode(array('back' => $back, 'total_results' => $total_results, "draw" => $draw, 'recordsTotal' => $total_results, 'recordsFiltered' => $filter_results, 'data' => $list));
19291929
die();
19301930
}
19311931

assets/grocery_crud/themes/datatables4/js/datatables.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,11 @@ function format_fields(e, name) {
211211
value = actionMenu(e.primary_key_value, (e[name].v !== null) ? e[name].v : '', e.action_urls);
212212
}
213213
} else {
214-
value = actionMenu(e.primary_key_value, (value !== null) ? value : '', e.action_urls);
214+
if (value != null && (value.startsWith('<button') || value.startsWith('<a'))) {
215+
value = value.replaceAll('&nbsp;', ' ').replaceAll('&thinsp;', '&nbsp;');
216+
} else {
217+
value = actionMenu(e.primary_key_value, (value !== null) ? value : '', e.action_urls);
218+
}
215219
}
216220

217221
return value;

assets/grocery_crud/themes/datatables4/views/list_template.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,11 @@ function actionButton(id, actions = null) {
508508

509509

510510
function actionMenu(id, value, actions = null) {
511-
return `
511+
value = value.replaceAll('&nbsp;', ' ').replaceAll('&thinsp;', '&nbsp;');
512+
let result = `
512513
<div class="dropdown">
513514
<span texttogo="true" class="black-text" type="button" style="min-width: 50px; min-height: 20px" data-toggle="dropdown" aria-expanded="false">
514-
` + value.replaceAll('&nbsp;', ' ').replaceAll('&thinsp;', '&nbsp;') + `
515+
` + value + `
515516
</span>
516517
<ul class="dropdown-menu">
517518

@@ -543,6 +544,12 @@ function actionMenu(id, value, actions = null) {
543544
</ul>
544545
</div>
545546
`
547+
let noAction = <?php echo ($unset_read && $unset_clone && $unset_edit && $unset_delete) ? 'true' : 'false'; ?>;
548+
if (!noAction && (actions != null || actions != '')) {
549+
return result;
550+
} else {
551+
return value;
552+
}
546553
}
547554

548555

0 commit comments

Comments
 (0)