فهرست منبع

update SiteController to use sys_filemount.identifier field

Olivier Massot 1 سال پیش
والد
کامیت
8ca64e050b
1فایلهای تغییر یافته به همراه19 افزوده شده و 12 حذف شده
  1. 19 12
      ot_admin/Classes/Controller/SiteController.php

+ 19 - 12
ot_admin/Classes/Controller/SiteController.php

@@ -573,7 +573,7 @@ class SiteController extends ActionController
             $queryBuilder->insert('sys_filemounts')
                 ->values([
                     'title' => 'Documents',
-                    'path' => rtrim($uploadRelPath, '/') . '/'
+                    'identifier' => '1:' . rtrim($uploadRelPath, '/') . '/'
                 ])
                 ->executeStatement();
 
@@ -581,7 +581,7 @@ class SiteController extends ActionController
             $queryBuilder->insert('sys_filemounts')
                 ->values([
                     'title' => 'Forms_' . $organizationId,
-                    'path' => rtrim($formsRelPath, '/') . '/'
+                    'identifier' => '1:' . rtrim($formsRelPath, '/') . '/'
                 ])
                 ->executeStatement();
 
@@ -852,8 +852,8 @@ class SiteController extends ActionController
             $queryBuilder
                 ->select('uid')
                 ->from('sys_filemounts')
-                ->where("path LIKE '%user_upload/" . $organizationId . "/%'")
-                ->orWhere("path LIKE '%form_definitions/" . $organizationId . "/%'");
+                ->where("identifier LIKE '1:%user_upload/" . $organizationId . "/%'")
+                ->orWhere("identifier LIKE '1:%form_definitions/" . $organizationId . "/%'");
             $statement = $queryBuilder->executeQuery();
             $rows = $statement->fetchAllAssociative();
             foreach ($rows as $row) {
@@ -1111,15 +1111,22 @@ class SiteController extends ActionController
                 ->update('sys_template')
                 ->set('deleted', 0)
                 ->where($queryBuilder->expr()->eq('pid', $rootUid))
-                ->execute();
+                ->executeStatement();
 
             // remove filemounts
             $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_filemounts');
             $queryBuilder
                 ->update('sys_filemounts')
                 ->set('deleted', 0)
-                ->where($queryBuilder->expr()->eq('path', "'/user_upload/" . $organizationId . "/'"))
-                ->execute();
+                ->where($queryBuilder->expr()->eq('identifier', "'1:/user_upload/" . $organizationId . "/'"))
+                ->executeStatement();
+
+            $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_filemounts');
+            $queryBuilder
+                ->update('sys_filemounts')
+                ->set('deleted', 0)
+                ->where($queryBuilder->expr()->eq('identifier', "'1:/form_definitions/" . $organizationId . "/'"))
+                ->executeStatement();
 
             try {
                 $editorsGroupUid = $this->findEditorsBeGroupUid($rootUid, false);
@@ -1129,7 +1136,7 @@ class SiteController extends ActionController
                         ->update('be_groups')
                         ->set('deleted', 0)
                         ->where($queryBuilder->expr()->eq('uid', $editorsGroupUid))
-                        ->execute();
+                        ->executeStatement();
                 }
             } catch (NoSuchRecordException $e) {}
 
@@ -1141,7 +1148,7 @@ class SiteController extends ActionController
                         ->update('be_users')
                         ->set('deleted', 0)
                         ->where($queryBuilder->expr()->eq('uid', $adminBeUserUid))
-                        ->execute();
+                        ->executeStatement();
                 }
             } catch (NoSuchRecordException $e) {}
 
@@ -2393,7 +2400,7 @@ class SiteController extends ActionController
             ->from('sys_filemounts')
             ->where("path LIKE '%user_upload/" . $organizationId . "/'")
             ->orWhere("path LIKE '%form_definitions/" . $organizationId . "/'");
-        $statement = $queryBuilder->execute();
+        $statement = $queryBuilder->executeQuery();
         $rows = $statement->fetchAllAssociative() ?: [];
         $fileMounts = [];
         foreach ($rows as $row) {
@@ -2423,14 +2430,14 @@ class SiteController extends ActionController
             foreach ($values as $k => $v) {
                 $q->set($k, $v);
             }
-            $q->execute();
+            $q->executeStatement();
 
             return $updateUid;
         }
 
         $queryBuilder->insert('be_groups')
             ->values($values)
-            ->execute();
+            ->executeStatement();
 
         return $queryBuilder->getConnection()->lastInsertId();
     }