Browse Source

Merge branch 'develop'

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

+ 2
- 2
Field/Filter/AssociationFilter.php View File

@@ -57,9 +57,9 @@ class AssociationFilter
public function applyFilter(RepositoryQueryInterface $repositoryQuery, FieldDto $fieldDto, $filteredValue = null)
{
$fieldProperty = $this->getFieldProperty($fieldDto);
if ($filteredValue !== null) {

if ($fieldDto->getFormTypeOption('multiple')) {
if ($filteredValue !== null) {
if ($fieldDto->getFormTypeOption('multiple') || ($fieldDto->getTemplatePath() != null && str_contains($fieldDto->getTemplatePath(), 'association_many'))) {
$repositoryQuery->andWhere(':' . $fieldProperty . ' MEMBER OF .' . $fieldProperty . '');
} else {
$repositoryQuery->andWhere('.' . $fieldProperty . ' = :' . $fieldProperty . '');

+ 5
- 0
Repository/AbstractRepositoryQuery.php View File

@@ -157,6 +157,11 @@ abstract class AbstractRepositoryQuery implements RepositoryQueryInterface
return $this->andWhere('.oldUrls LIKE :oldUrl')->setParameter('oldUrl', '%'.$oldUrl.'%');
}

public function resetRelationsJoin(): void
{

}

/*
* DEVALIAS
*/

+ 1
- 0
Repository/AbstractStore.php View File

@@ -10,6 +10,7 @@ abstract class AbstractStore implements StoreInterface
public function createDefaultQuery(RepositoryQueryInterface $query = null): RepositoryQueryInterface
{
$query = $this->createQuery($query);
$query->resetRelationsJoin();
$this->filtersDefault($query);
$this->relationsDefault($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

@@ -147,4 +147,6 @@ table.fixedHeader-floating {

.hidden {
display: none;
}
}

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

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

@@ -21,7 +21,7 @@
{% include '@LcSov/admin/ticket/field/lastmessage.html.twig' %}
</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) }}">
<i class="fas fa-eye"></i>
</a>

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

@@ -1,3 +1,11 @@
{% 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 %}

+ 2
- 2
Translation/TranslatorAdmin.php View File

@@ -16,9 +16,9 @@ class TranslatorAdmin
$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

+ 2
- 2
Twig/TranslatorTwigExtension.php View File

@@ -117,9 +117,9 @@ class TranslatorTwigExtension extends AbstractExtension
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 = [])

Loading…
Cancel
Save