Browse Source

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

develop
Charly 3 years ago
parent
commit
5fec05b1c6
9 changed files with 23 additions and 7 deletions
  1. +5
    -0
      Repository/AbstractRepositoryQuery.php
  2. +1
    -0
      Repository/AbstractStore.php
  3. BIN
      Resources/assets/app/adminlte/main/img/stripe.png
  4. BIN
      Resources/assets/app/adminlte/main/img/stripped.png
  5. +3
    -1
      Resources/assets/app/adminlte/main/scss/_common.scss
  6. +1
    -1
      Resources/views/admin/ticket/macro.html.twig
  7. +9
    -1
      Resources/views/adminlte/crud/field/association_many.html.twig
  8. +2
    -2
      Translation/TranslatorAdmin.php
  9. +2
    -2
      Twig/TranslatorTwigExtension.php

+ 5
- 0
Repository/AbstractRepositoryQuery.php View File

return $this->andWhere('.oldUrls LIKE :oldUrl')->setParameter('oldUrl', '%'.$oldUrl.'%'); return $this->andWhere('.oldUrls LIKE :oldUrl')->setParameter('oldUrl', '%'.$oldUrl.'%');
} }


public function resetRelationsJoin(): void
{

}

/* /*
* DEVALIAS * DEVALIAS
*/ */

+ 1
- 0
Repository/AbstractStore.php View File

public function createDefaultQuery(RepositoryQueryInterface $query = null): RepositoryQueryInterface public function createDefaultQuery(RepositoryQueryInterface $query = null): RepositoryQueryInterface
{ {
$query = $this->createQuery($query); $query = $this->createQuery($query);
$query->resetRelationsJoin();
$this->filtersDefault($query); $this->filtersDefault($query);
$this->relationsDefault($query); $this->relationsDefault($query);
$this->orderByDefault($query); $this->orderByDefault($query);

BIN
Resources/assets/app/adminlte/main/img/stripe.png View File

Before After
Width: 456  |  Height: 456  |  Size: 143KB

BIN
Resources/assets/app/adminlte/main/img/stripped.png View File

Before After
Width: 40  |  Height: 40  |  Size: 8.9KB

+ 3
- 1
Resources/assets/app/adminlte/main/scss/_common.scss View File



.hidden { .hidden {
display: none; display: none;
}
}

.badge.stripped{background-image: url('../img/stripped.png');}

+ 1
- 1
Resources/views/admin/ticket/macro.html.twig View File

{% include '@LcSov/admin/ticket/field/lastmessage.html.twig' %} {% include '@LcSov/admin/ticket/field/lastmessage.html.twig' %}
</td> </td>
<td> <td>
<a class="btn-sm btn-success" data-toggle="tooltip" title="{{ 'detail'|sov_trans_admin_action('Ticket') }}"
<a class="btn-sm btn-success" data-toggle="tooltip" title="{{ 'detail'|sov_trans_admin_action }}"
href="{{ ea_url_short("App\\Controller\\Ticket\\TicketAdminController", 'detail', ticket.id) }}"> href="{{ ea_url_short("App\\Controller\\Ticket\\TicketAdminController", 'detail', ticket.id) }}">
<i class="fas fa-eye"></i> <i class="fas fa-eye"></i>
</a> </a>

+ 9
- 1
Resources/views/adminlte/crud/field/association_many.html.twig View File

{% for entity in field.value %} {% for entity in field.value %}
<span class="badge badge-secondary">{{ entity }}</span>
{% if field.customOption('crudControllerFqcn') is not null and entity is not null%}
<a href="{{ ea_url_short(field.customOption('crudControllerFqcn'), 'edit', entity.id) }}">
<span class="badge badge-secondary">
{{ entity }}
</span>
</a>
{% else %}
<span class="badge badge-secondary">{{ entity }}</span>
{% endif %}
{% endfor %} {% endfor %}

+ 2
- 2
Translation/TranslatorAdmin.php View File

$this->translator = $translator; $this->translator = $translator;
} }


public function transAction($action): string
public function transAction($action, $params=[]): string
{ {
return $this->trans('action.' . $action);
return $this->trans('action.' . $action, $params);
} }


public function transMenu($menu, $params = []): string public function transMenu($menu, $params = []): string

+ 2
- 2
Twig/TranslatorTwigExtension.php View File

return $this->translatorAdmin->transMenu($menuName, $params);; return $this->translatorAdmin->transMenu($menuName, $params);;
} }


public function transAdminAction($actionName)
public function transAdminAction($actionName, $params = [])
{ {
return $this->translatorAdmin->transAction($actionName);;
return $this->translatorAdmin->transAction($actionName, $params);;
} }


public function transAdminTitle($pageName, $entityClass = null, $params = []) public function transAdminTitle($pageName, $entityClass = null, $params = [])

Loading…
Cancel
Save