Browse Source

Merge branch 'develop' of https://gitea.laclic.fr/Laclic/SovBundle into develop

feature/ticket
Guillaume 3 years ago
parent
commit
727acb84ea
3 changed files with 2 additions and 3 deletions
  1. +1
    -1
      Controller/AbstractAdminController.php
  2. +0
    -1
      Controller/Dashboard/DashboardController.php
  3. +1
    -1
      Resources/views/adminlte/block/menu.html.twig

+ 1
- 1
Controller/AbstractAdminController.php View File

$filters $filters
); );


dump(get_defined_vars());
/*dump(get_defined_vars());*/
if ($this->isInstanceOf(TreeInterface::class)) { if ($this->isInstanceOf(TreeInterface::class)) {
$entityId = $searchDto->getRequest()->get('entityId'); $entityId = $searchDto->getRequest()->get('entityId');
if ($entityId !== null) { if ($entityId !== null) {

+ 0
- 1
Controller/Dashboard/DashboardController.php View File

] ]
); );
} }

} }

+ 1
- 1
Resources/views/adminlte/block/menu.html.twig View File

<a href="{{ item.linkUrl }}" class="nav-link {{ ea.mainMenu.isSelected(item)? 'active' }} {{ ea.mainMenu.isExpanded(item) and is_sub_item == false ? 'active' }} {{ item.cssClass }}" <a href="{{ item.linkUrl }}" class="nav-link {{ ea.mainMenu.isSelected(item)? 'active' }} {{ ea.mainMenu.isExpanded(item) and is_sub_item == false ? 'active' }} {{ item.cssClass }}"
target="{{ item.linkTarget }}" rel="{{ item.linkRel }}" referrerpolicy="origin-when-cross-origin"> target="{{ item.linkTarget }}" rel="{{ item.linkRel }}" referrerpolicy="origin-when-cross-origin">
{% if item.icon is not empty %} {% if item.icon is not empty %}
<i class="far fa-{{ item.icon }} nav-icon"></i>
<i class="{{ item.icon }} nav-icon"></i>
{% endif %} {% endif %}
<p>{{ item.label|lc_trans_admin_menu }}</p> <p>{{ item.label|lc_trans_admin_menu }}</p>
{% if item.hasSubItems %}<i class="right fas fa-angle-left"></i>{% endif %} {% if item.hasSubItems %}<i class="right fas fa-angle-left"></i>{% endif %}

Loading…
Cancel
Save