Bladeren bron

fix the commands with an --all option

Olivier Massot 4 jaren geleden
bovenliggende
commit
74d7658f8e

+ 4 - 6
ot_admin/Classes/Command/ResetBeUserPermsCommand.php

@@ -81,19 +81,17 @@ class ResetBeUserPermsCommand extends Command
 
         if ($all) {
             $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-            $queryBuilder = $connectionPool->getQueryBuilderForTable('pages');
+            $queryBuilder = $connectionPool->getQueryBuilderForTable('ot_websites');
             $sites = $queryBuilder
-                ->select('tx_opentalent_structure_id')
-                ->from('pages')
-                ->where('is_siteroot=1')
-                ->andWhere($queryBuilder->expr()->gt('tx_opentalent_structure_id', 0))
+                ->select('organization_id')
+                ->from('ot_websites')
                 ->execute()
                 ->fetchAll();
 
             $io->progressStart(count($sites));
 
             foreach ($sites as $site) {
-                $org_id = $site['tx_opentalent_structure_id'];
+                $org_id = $site['organization_id'];
                 try {
                     $siteController->resetBeUserPermsAction($org_id, $create);
                 } catch (\Throwable $e) {

+ 4 - 6
ot_admin/Classes/Command/UpdateRoutingIndexCommand.php

@@ -72,19 +72,17 @@ class UpdateRoutingIndexCommand extends Command
 
         if ($all) {
             $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-            $queryBuilder = $connectionPool->getQueryBuilderForTable('pages');
+            $queryBuilder = $connectionPool->getQueryBuilderForTable('ot_websites');
             $sites = $queryBuilder
-                ->select('tx_opentalent_structure_id')
-                ->from('pages')
-                ->where('is_siteroot=1')
-                ->andWhere($queryBuilder->expr()->gt('tx_opentalent_structure_id', 0))
+                ->select('organization_id')
+                ->from('ot_websites')
                 ->execute()
                 ->fetchAll();
 
             $io->progressStart(count($sites));
 
             foreach ($sites as $site) {
-                $org_id = $site['tx_opentalent_structure_id'];
+                $org_id = $site['organization_id'];
                 try {
                     $siteController->updateRoutingIndexAction($org_id);
                 } catch (\Throwable $e) {

+ 4 - 6
ot_admin/Classes/Command/UpdateSiteCommand.php

@@ -83,19 +83,17 @@ class UpdateSiteCommand extends Command
 
         if ($all) {
             $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-            $queryBuilder = $connectionPool->getQueryBuilderForTable('pages');
+            $queryBuilder = $connectionPool->getQueryBuilderForTable('ot_websites');
             $sites = $queryBuilder
-                ->select('tx_opentalent_structure_id')
-                ->from('pages')
-                ->where('is_siteroot=1')
-                ->andWhere($queryBuilder->expr()->gt('tx_opentalent_structure_id', 0))
+                ->select('organization_id')
+                ->from('ot_websites')
                 ->execute()
                 ->fetchAll();
 
             $io->progressStart(count($sites));
 
             foreach ($sites as $site) {
-                $org_id = $site['tx_opentalent_structure_id'];
+                $org_id = $site['organization_id'];
                 try {
                     $siteController->updateSiteAction($org_id, $deep);
                 } catch (\Throwable $e) {

+ 1 - 0
ot_admin/Classes/Controller/SiteController.php

@@ -672,6 +672,7 @@ class SiteController extends ActionController
                 $queryBuilder = $this->connectionPool->getQueryBuilderForTable('pages');
                 $queryBuilder->update('pages')
                     ->set('ot_website_uid', $website['uid'])
+                    ->set('TSconfig', null)
                     ->where($queryBuilder->expr()->eq('uid', $page['uid']))
                     ->execute();
             }