From 4ff3c308fb65f7b7987752399df7bfbd3bcb99e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anke=20H=C3=A4slich?= Date: Fri, 15 Mar 2024 12:55:02 +0100 Subject: [PATCH] TASK: Adjust to removal of `workspaceName` in `NodeIdToPublishOrDiscard` See: https://github.com/neos/neos-development-collection/commit/43827ba4bf6f3989df05c1bcce142075e9abacc0 --- Classes/ContentRepository/Service/WorkspaceService.php | 3 +-- Classes/Controller/BackendServiceController.php | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Classes/ContentRepository/Service/WorkspaceService.php b/Classes/ContentRepository/Service/WorkspaceService.php index 2880c2768e..7baf91f7fb 100644 --- a/Classes/ContentRepository/Service/WorkspaceService.php +++ b/Classes/ContentRepository/Service/WorkspaceService.php @@ -179,8 +179,7 @@ public function predictRemoveNodeFeedbackFromDiscardIndividualNodesFromWorkspace } if ( - $nodeToDiscard->workspaceName->equals($workspace->workspaceName) - && $nodeToDiscard->nodeAggregateId->equals($change->nodeAggregateId) + $nodeToDiscard->nodeAggregateId->equals($change->nodeAggregateId) && $nodeToDiscard->dimensionSpacePoint->equals($change->originDimensionSpacePoint) ) { $subgraph = $contentRepository->getContentGraph() diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php index c1266be471..f787ae5c81 100644 --- a/Classes/Controller/BackendServiceController.php +++ b/Classes/Controller/BackendServiceController.php @@ -221,7 +221,6 @@ public function publishAction(array $nodeContextPaths, string $targetWorkspaceNa foreach ($nodeContextPaths as $contextPath) { $nodeAddress = $nodeAddressFactory->createFromUriString($contextPath); $nodeIdentifiersToPublish[] = new NodeIdToPublishOrDiscard( - $workspaceName, $nodeAddress->nodeAggregateId, $nodeAddress->dimensionSpacePoint ); @@ -279,7 +278,6 @@ public function discardAction(array $nodeContextPaths): void foreach ($nodeContextPaths as $contextPath) { $nodeAddress = $nodeAddressFactory->createFromUriString($contextPath); $nodeIdentifiersToDiscard[] = new NodeIdToPublishOrDiscard( - $workspaceName, $nodeAddress->nodeAggregateId, $nodeAddress->dimensionSpacePoint );