TASK: Use getCurrentBaseWorkspace of Neos.Neos' Workspace model...

...to retrieve the base workspace during publish opertaions. As suggested by @nezaniel (see: #3759 (comment))
neos · Apr 22, 2024 · 455ff67 · 455ff67
1 parent fd1baeb
commit 455ff67
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -200,13 +200,10 @@ public function publishChangesInSiteAction(array $command): void
             $publishingResult = $workspace
                 ->publishChangesInSite($command->siteId);
 
-            $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
-            $baseWorkspaceName = $contentRepository->getWorkspaceFinder()->findOneByName($command->workspaceName)->baseWorkspaceName;
-
             $this->view->assign('value', [
                 'success' => [
                     'numberOfAffectedChanges' => $publishingResult->numberOfPublishedChanges,
-                    'baseWorkspaceName' => $baseWorkspaceName->value
+                    'baseWorkspaceName' => $workspace->getCurrentBaseWorkspaceName()?->value
                 ]
             ]);
         } catch (\Exception $e) {
@@ -239,10 +236,6 @@ public function publishChangesInDocumentAction(array $command): void
             $command = PublishChangesInDocument::fromArray($command);
 
             $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId;
-            $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
-            $baseWorkspaceName = $contentRepository->getWorkspaceFinder()->findOneByName(
-                $command->workspaceName
-            )->baseWorkspaceName;
 
             try {
                 $workspace = $this->workspaceProvider->provideForWorkspaceName(
@@ -254,7 +247,7 @@ public function publishChangesInDocumentAction(array $command): void
                 $this->view->assign('value', [
                     'success' => [
                         'numberOfAffectedChanges' => $publishingResult->numberOfPublishedChanges,
-                        'baseWorkspaceName' => $baseWorkspaceName->value
+                        'baseWorkspaceName' => $workspace->getCurrentBaseWorkspaceName()?->value
                     ]
                 ]);
             } catch (NodeAggregateCurrentlyDoesNotExist $e) {