Recuperando cambios peridos en el merge?

This commit is contained in:
imnavajas
2023-05-16 14:13:42 +02:00
parent 224ea78c3c
commit dd9686d966
9 changed files with 66 additions and 43 deletions

View File

@ -160,7 +160,7 @@
"scrollX": true,
"stateSave": true,
"language": {
//url: "//cdn.datatables.net/plug-ins/1.10.25/i18n/languages[$currentLocale] ?? config('Basics')->i18n ?>.json"
url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
},
"columnDefs": [
{

View File

@ -78,7 +78,6 @@
<!-- </td>-->
<!-- </tr>-->
<?php foreach (getAllFolder() as $folder): ?>
<?php foreach (getAllClass() as $item): ?>
<?php if (str_contains($item['path'], $folder)): ?>
<tr>
@ -90,7 +89,9 @@
<input type="checkbox"
id="<?= $item['name'] . '_' . $subitem ?>"
name="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-input">
class="form-check-input"
<?=ruleIsChecked($group->rules, $item['name'], $subitem)?'checked':''?>
>
<label for="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-label"><?= getDictionary($subitem) ?></label>
</div>
@ -113,7 +114,9 @@
<input type="checkbox"
id="<?= $item['name'] . '_' . $subitem ?>"
name="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-input">
class="form-check-input"
<?=ruleIsChecked($group->rules, $item['name'], $subitem)?'checked':''?>
>
<label for="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-label"><?= getDictionary($subitem) ?></label>
</div>