Merge branch 'develop'

Field/Filter/AssociationFilter.php

@@ -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 . '');

Repository/AbstractRepositoryQuery.php

@@ -157,6 +157,11 @@ abstract class AbstractRepositoryQuery implements RepositoryQueryInterface
         return $this->andWhere('.oldUrls LIKE :oldUrl')->setParameter('oldUrl', '%'.$oldUrl.'%');
     }
 
+    public function resetRelationsJoin(): void
+    {
+
+    }
+
     /*
      *  DEVALIAS
      */

Repository/AbstractStore.php

@@ -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);

Resources/assets/app/adminlte/main/scss/_common.scss

@@ -147,4 +147,6 @@ table.fixedHeader-floating {
 
 .hidden {
   display: none;
-}
+}
+
+.badge.stripped{background-image: url('../img/stripped.png');}

Resources/views/admin/ticket/macro.html.twig

@@ -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>

Resources/views/adminlte/crud/field/association_many.html.twig

@@ -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 %}

Translation/TranslatorAdmin.php

@@ -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

Twig/TranslatorTwigExtension.php

@@ -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 = [])