Resolviendo conflictos

This commit is contained in:
unknown
2025-04-21 14:09:08 +02:00
parent 63254f0bf3
commit 753aafe05d

View File

@ -1,35 +1,33 @@
<?php <?php
/** /**
* MENU CATALOGO * MENU CATALOGO
*/ */
if (auth()->user()->inGroup('beta')) { if (auth()->user()->can('catalogo.menu')) {
?> ?>
<!-- Catalogue --> <!-- Catalogue -->
<li class="menu-item"> <li class="menu-item">
<a href="javascript:void(0);" class="menu-link menu-toggle beta"> <a href="javascript:void(0);" class="menu-link menu-toggle">
<i class="menu-icon tf-icons ti ti-book"></i> <i class="menu-icon tf-icons ti ti-book"></i>
<div><?= lang("App.menu_catalogo") ?></div> <?= lang("App.menu_catalogo") ?>
</a> </a>
<ul class="menu-sub"> <ul class="menu-sub">
<li class="menu-item"> <?php if (auth()->user()->can('catalogo.menu')) { ?>
<a href="<?= site_url("catalogo/catalogo") ?>" class="menu-link beta"> <li class="menu-item">
<div><?= lang("App.menu_catalogo_libros") ?></div> <a href="<?= route_to("CatalogoLibrosList") ?>" class="menu-link">
</a> <?= lang("App.menu_catalogo_libros") ?>
</li> </a>
<li class="menu-item"> </li>
<a href="<?= site_url("catalogo/catalogo/nuevo") ?>" class="menu-link beta"> <?php } ?>
<div><?= lang("App.menu_catalogo_nuevo") ?></div> <?php if (auth()->user()->can('catalogo.create')) { ?>
</a> <li class="menu-item">
</li> <a href="<?= route_to("CatalogoLibrosAdd") ?>" class="menu-link">
<li class="menu-item"> <?= lang("App.menu_catalogo_nuevo") ?>
<a href="<?= site_url("catalogo/catalogo/categorias") ?>" class="menu-link beta"> </a>
<div><?= lang("App.menu_catalogo_categorias") ?></div> </li>
</a> <?php } ?>
</li>
<li class="menu-item"> <li class="menu-item">
<a href="<?= site_url("catalogo/catalogo/importar") ?>" class="menu-link beta"> <a href="<?= site_url("catalogo/catalogo/importar") ?>" class="menu-link beta">
<div> <?= lang("App.menu_catalogo_importar") ?></div> <?= lang("App.menu_catalogo_importar") ?>
</a> </a>
</li> </li>
</ul> </ul>