Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue

@@ -78,11 +78,13 @@ export default {
             case 'thirdparty':
                let data = this.$refs.castThirdparty.$data.thirdparty;
                data.name = data.text;
-               if (data.address !== null) {
+               /*
+               if (data.address !== undefined && data.address !== null) {
                    data.address = { id: data.address.address_id }
                } else {
                    data.address = null;
                }
+               */
 
                return data;
             default:

src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php

@@ -12,12 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use DateTimeImmutable;
-use Doctrine\ORM\Query;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 class SocialIssueApiController extends ApiController
 {
@@ -32,22 +29,10 @@ class SocialIssueApiController extends ApiController
         $query->setParameter('now', new DateTimeImmutable());
     }
 
-    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query)
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
-        // In order to work, this hydrator only works with
-        // entities having the field "children" set up.
-        return $query
-            ->getQuery()
-            ->setHint(Query::HINT_INCLUDE_META_COLUMNS, true)
-            ->getResult(FlatHierarchyEntityHydrator::LIST);
-    }
+        $query->addOrderBy('e.ordering', 'ASC');
 
-    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
-    {
-        $query
-            ->orderBy('GET_JSON_FIELD_BY_KEY(e.title, :locale)', 'ASC')
-            ->setParameter(':locale', $request->getLocale());
-
-        return null;
+        return $query;
     }
 }

src/Bundle/ChillPersonBundle/config/services/controller.yaml

@@ -66,3 +66,4 @@ services:
     Chill\PersonBundle\Controller\RelationshipApiController:
         autowire: true
         tags: ['controller.service_arguments']
+