浏览代码

minor fixes

Olivier Massot 5 年之前
父节点
当前提交
8541e7fa04

+ 1 - 1
ot_connect/Classes/Service/OtAuthenticationService.php

@@ -350,7 +350,7 @@ class OtAuthenticationService extends AbstractAuthenticationService
                 $q = $connection->createQueryBuilder();
                 $q->select('uid')
                     ->from('sys_filemounts')
-                    ->where("path LIKE '/user_upload/" . $access['organizationId'] . "/%'");
+                    ->where("path LIKE '%user_upload/" . $access['organizationId'] . "/%'");
                 $res = $q->execute();
                 $rows = $res->fetchAll(3) ?: [];
                 $files = [];

+ 13 - 7
ot_templating/Classes/Page/OtPageRepository.php

@@ -3,6 +3,7 @@
 namespace Opentalent\OtTemplating\Page;
 
 use FluidTYPO3\Vhs\Service\PageService;
+use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -60,6 +61,9 @@ class OtPageRepository extends PageRepository
         return [];
     }
 
+
+
+
     /**
      * Recursively returns all the subpages of the given page
      *
@@ -69,13 +73,15 @@ class OtPageRepository extends PageRepository
     public function getAllSubpagesForPage($pageUid) {
         $subpages = [];
 
-        $stack = $this->getSubpagesForPages(
-            [$pageUid],
-            '*',
-            'sorting',
-            '',
-            false
-        );
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
+            ->getQueryBuilderForTable('pages');
+        $queryBuilder->getRestrictions()->removeAll();
+        $stack = $queryBuilder
+            ->select('*')
+            ->from('pages')
+            ->where($queryBuilder->expr()->eq('pid', $pageUid))
+            ->execute()
+            ->fetchAll();
 
         foreach ($stack as $page) {
             $subpages[] = $page;

+ 1 - 1
ot_templating/Resources/Private/Templates/Forms/EmailToSender.html

@@ -39,7 +39,7 @@
     <p>Bonjour,</p>
 
     <p>Votre demande de contact a bien été prise en compte.
-       Vous pouvez trouver ci-dessous un récapitulatif de cette demande:</p>
+       Vous pouvez trouver ci-dessous un récapitulatif de cette demande :</p>
 
     <table id="recap">
         <formvh:renderAllFormValues renderable="{form.formDefinition}" as="formValue">