Merge remote-tracking branch 'origin/8.4' into 9.0

neos · Jan 16, 2025 · 255366d · 255366d
2 parents 36781f8 + 7476324
commit 255366d
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 13 deletions.
diff --git a/Neos.Media.Browser/Classes/Controller/UsageController.php b/Neos.Media.Browser/Classes/Controller/UsageController.php
@@ -19,7 +19,6 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ActionController;
-use Neos\Flow\Security\Context as SecurityContext;
 use Neos\Media\Domain\Model\AssetInterface;
 use Neos\Media\Domain\Service\AssetService;
 use Neos\Neos\AssetUsage\Dto\AssetUsageReference;
@@ -79,6 +78,12 @@ class UsageController extends ActionController
      */
     protected $contentRepositoryAuthorizationService;
 
+    /**
+     * @Flow\Inject
+     * @var PrivilegeManagerInterface
+     */
+    protected $privilegeManager;
+
     /**
      * Get Related Nodes for an asset
      *
@@ -120,6 +125,7 @@ public function relatedNodesAction(AssetInterface $asset)
             $workspacePermissions = $this->contentRepositoryAuthorizationService->getWorkspacePermissions($currentContentRepositoryId, $usage->getWorkspaceName(), $this->securityContext->getRoles(), $this->userService->getBackendUser()?->getId());
             $workspace = $contentRepository->findWorkspaceByName($usage->getWorkspaceName());
 
+            $inaccessibleRelation['label'] = $this->getLabelForInaccessibleWorkspace($workspace);
             $inaccessibleRelation['nodeIdentifier'] = $usage->getNodeAggregateId()->value;
             $inaccessibleRelation['workspaceName'] = $usage->getWorkspaceName()->value;
             $inaccessibleRelation['workspace'] = $workspace;
@@ -183,7 +189,28 @@ public function relatedNodesAction(AssetInterface $asset)
             'inaccessibleRelations' => $inaccessibleRelations,
             'relatedNodes' => $relatedNodes,
             'contentDimensions' => $currentContentRepository->getContentDimensionSource()->getContentDimensionsOrderedByPriority(),
-            'userWorkspace' => $userWorkspace
+            'userWorkspace' => $userWorkspace,
         ]);
     }
+
+    private function getLabelForInaccessibleWorkspace(Workspace $workspace): string
+    {
+        /*
+        TODO: Needs to get re-implemented for Neos 9.
+              See: https://github.com/neos/neos-development-collection/pull/5182
+
+        $currentAccount = $this->securityContext->getAccount();
+
+        if ($currentAccount != null && $this->privilegeManager->isPrivilegeTargetGranted('Neos.Media.Browser:WorkspaceName')) {
+            if ($workspace->isPrivateWorkspace()) {
+                $owner = $workspace->getOwner();
+                return '(' . $owner->getLabel() . ')';
+            } else {
+                return '(' . $workspace->getTitle() . ')';
+            }
+        }
+        */
+
+        return '';
+    }
 }
diff --git a/Neos.Media.Browser/Configuration/Policy.yaml b/Neos.Media.Browser/Configuration/Policy.yaml
@@ -28,6 +28,12 @@ privilegeTargets:
       label: Allowed to replace asset resources
       matcher: 'method(Neos\Media\Browser\Controller\(Asset|Image)Controller->(replaceAssetResource|updateAssetResource)Action())'
 
+    # We evaluate the WorkspaceName privilegeTarget in code (UsageController) to determine whether we should show workspace names or not.
+    # To control access to the module in general, Neos.Media.Browser:AssetUsage is used (so that's why they have the same matcher string).
+    'Neos.Media.Browser:WorkspaceName':
+      label: Allowed to see workspace owner
+      matcher: 'method(Neos\Media\Browser\Controller\UsageController->relatedNodesAction())'
+
 roles:
   'Neos.Neos:AbstractEditor':
     privileges:
@@ -55,6 +61,9 @@ roles:
       -
         privilegeTarget: 'Neos.Media.Browser:ManageAssetCollections'
         permission: GRANT
+      -
+        privilegeTarget: 'Neos.Media.Browser:WorkspaceName'
+        permission: GRANT
 
   'Neos.Flow:Everybody':
     privileges:

diff --git a/Neos.Media.Browser/Resources/Private/Templates/Asset/Edit.html b/Neos.Media.Browser/Resources/Private/Templates/Asset/Edit.html
@@ -57,16 +57,14 @@ <h2>{neos:backend.translate(id: 'connectionError', package: 'Neos.Media.Browser'
                                             </label>
                                         </f:for>
                                     </f:if>
-                                    <f:security.ifAccess privilegeTarget="Neos.Media.Browser:ManageAssetCollections">
-                                        <f:if condition="{assetCollections}">
-                                            <label>{neos:backend.translate(id: 'collections', package: 'Neos.Media.Browser')}</label>
-                                            <f:for each="{assetCollections}" as="assetCollection">
-                                                <label class="neos-checkbox neos-inline">
-                                                    <m:form.checkbox property="assetCollections" multiple="TRUE" value="{assetCollection}" /><span></span> {assetCollection.title}
-                                                </label>
-                                            </f:for>
-                                        </f:if>
-                                    </f:security.ifAccess>
+																		<f:if condition="{assetCollections}">
+																				<label>{neos:backend.translate(id: 'collections', package: 'Neos.Media.Browser')}</label>
+																				<f:for each="{assetCollections}" as="assetCollection">
+																						<label class="neos-checkbox neos-inline">
+																								<m:form.checkbox property="assetCollections" multiple="TRUE" value="{assetCollection}" /><span></span> {assetCollection.title}
+																						</label>
+																				</f:for>
+																		</f:if>
                                 </fieldset>
                                 <fieldset>
                                     <legend>{neos:backend.translate(id: 'metadata', package: 'Neos.Media.Browser')}</legend>

diff --git a/Neos.Media.Browser/Resources/Private/Templates/Usage/RelatedNodes.html b/Neos.Media.Browser/Resources/Private/Templates/Usage/RelatedNodes.html
@@ -39,18 +39,21 @@
                                    title="{neos:backend.translate(id: 'workspaces.personalWorkspace', source: 'Main', package: 'Neos.Workspace.Ui')}"
                                    data-neos-toggle="tooltip"></i>
                                 {neos:backend.translate(id: 'workspaces.personalWorkspace', source: 'Main', package: 'Neos.Workspace.Ui')}
+															  {inaccessibleRelation.label}
                             </f:case>
                             <f:case value="{inaccessibleRelation.workspace.privateWorkspace}">
                                 <i class="fas fa-shield"
                                    title="{neos:backend.translate(id: 'workspaces.privateWorkspace', source: 'Main', package: 'Neos.Workspace.Ui')}"
                                    data-neos-toggle="tooltip"></i>
                                 {neos:backend.translate(id: 'workspaces.privateWorkspace', source: 'Main', package: 'Neos.Workspace.Ui')}
+															{inaccessibleRelation.label}
                             </f:case>
                             <f:case value="{inaccessibleRelation.workspace.internalWorkspace}">
                                 <i class="fas fa-group"
                                    title="{neos:backend.translate(id: 'workspaces.internalWorkspace', source: 'Main', package: 'Neos.Workspace.Ui')}"
                                    data-neos-toggle="tooltip"></i>
                                 {neos:backend.translate(id: 'workspaces.internalWorkspace', source: 'Main', package: 'Neos.Workspace.Ui')}
+															{inaccessibleRelation.label}
                             </f:case>
                             <f:defaultCase>
                                 ---

diff --git a/Neos.Neos/Configuration/Policy.yaml b/Neos.Neos/Configuration/Policy.yaml
@@ -234,7 +234,6 @@ roles:
   'Neos.Neos:Administrator':
     label: Neos Administrator
     description: Grants access to all modules and functionalities of the Neos backend.
-
     parentRoles: ['Neos.Neos:Editor']
     privileges:
       -

diff --git a/Neos.Neos/Documentation/Appendixes/ChangeLogs/8318.rst b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8318.rst
@@ -0,0 +1,35 @@
+`8.3.18 (2024-11-18) <https://github.com/neos/neos-development-collection/releases/tag/8.3.18>`_
+================================================================================================
+
+Overview of merged pull requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`BUGFIX: Restore asset collection assignment capabilities <https://github.com/neos/neos-development-collection/pull/5367>`_
+---------------------------------------------------------------------------------------------------------------------------
+
+resolves `#5365 <https://github.com/neos/neos-development-collection/issues/5365>`_
+reverts `#4404 <https://github.com/neos/neos-development-collection/issues/4404>`_
+
+**Upgrade instructions**
+
+none
+
+**Review instructions**
+
+none
+
+
+* Packages: ``Neos`` ``Media.Browser``
+
+`BUGFIX: show workspace owner/title in media usage tab <https://github.com/neos/neos-development-collection/pull/5182>`_
+------------------------------------------------------------------------------------------------------------------------
+
+Issue: https://github.com/neos/neos-development-collection/issues/5181
+
+Possibility to enable showing all workspace titles/owners to user with certain roles in the media usage tab.
+
+
+* Packages: ``Neos`` ``Media.Browser``
+
+`Detailed log <https://github.com/neos/neos-development-collection/compare/8.3.17...8.3.18>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~