Skip to content

Commit 67636e7

Browse files
sivaschenkosivaschenko
committed
#29715: Moved ACL to MediaGalleryApi
1 parent 80dae45 commit 67636e7

File tree

27 files changed

+52
-53
lines changed

27 files changed

+52
-53
lines changed

‎app/code/Magento/MediaGallery/etc/acl.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎app/code/Magento/MediaGalleryApi/etc/acl.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
9+
<acl>
10+
<resources>
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::content">
13+
<resource id="Magento_Backend::content_elements">
14+
<resource id="Magento_MediaGalleryApi::media_gallery" title="Media Gallery" translate="title">
15+
<resource id="Magento_MediaGalleryApi::upload_assets" title="Upload Assets" translate="title" sortOrder="80"/>
16+
<resource id="Magento_MediaGalleryApi::delete_assets" title="Delete Assets" translate="title" sortOrder="70"/>
17+
<resource id="Magento_MediaGalleryApi::insert_assets" title="Insert Assets into the content" translate="title" sortOrder="60"/>
18+
<resource id="Magento_MediaGalleryApi::create_folder" title="Create Folder" translate="title" sortOrder="50"/>
19+
<resource id="Magento_MediaGalleryApi::delete_folder" title="Delete Folder" translate="title" sortOrder="40"/>
20+
</resource>
21+
</resource>
22+
</resource>
23+
</resource>
24+
</resources>
25+
</acl>
26+
</config>

‎app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
class Index extends Action implements HttpGetActionInterface
2020
{
21-
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
21+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::media_gallery';
2222

2323
/**
2424
* Get the media gallery layout

‎app/code/Magento/MediaGalleryCatalogUi/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"require": {
55
"php": "~7.3.0||~7.4.0",
66
"magento/framework": "*",
7-
"magento/module-cms": "*",
87
"magento/module-backend": "*",
98
"magento/module-catalog": "*",
109
"magento/module-store": "*",

‎app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</storageConfig>
2828
<updateUrl path="mui/index/render"/>
2929
</settings>
30-
<aclResource>Magento_Cms::media_gallery</aclResource>
30+
<aclResource>Magento_MediaGalleryApi::media_gallery</aclResource>
3131
<dataProvider class="Magento\MediaGalleryCatalogUi\Model\Listing\DataProvider" name="media_gallery_category_listing_data_source">
3232
<settings>
3333
<requestFieldName>entity_id</requestFieldName>

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Search extends Action implements HttpGetActionInterface
3434
/**
3535
* @see _isAllowed()
3636
*/
37-
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
37+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::media_gallery';
3838

3939
/**
4040
* @var SearchAssetsInterface

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Create.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Create extends Action implements HttpPostActionInterface
2929
/**
3030
* @see _isAllowed()
3131
*/
32-
public const ADMIN_RESOURCE = 'Magento_MediaGallery::create_folder';
32+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::create_folder';
3333

3434
/**
3535
* @var CreateDirectoriesByPathsInterface

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Delete extends Action implements HttpPostActionInterface
3030
/**
3131
* @see _isAllowed()
3232
*/
33-
public const ADMIN_RESOURCE = 'Magento_MediaGallery::delete_folder';
33+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::delete_folder';
3434

3535
/**
3636
* @var DeleteAssetsByPathsInterface

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class GetTree extends Action implements HttpGetActionInterface
2525
/**
2626
* @see _isAllowed()
2727
*/
28-
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
28+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::media_gallery';
2929

3030
/**
3131
* @var LoggerInterface

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Delete extends Action implements HttpPostActionInterface
3131
/**
3232
* @see _isAllowed()
3333
*/
34-
public const ADMIN_RESOURCE = 'Magento_MediaGallery::delete_assets';
34+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::delete_assets';
3535

3636
/**
3737
* @var DeleteImage

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Details.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Details extends Action implements HttpGetActionInterface
2929
/**
3030
* @see _isAllowed()
3131
*/
32-
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
32+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::media_gallery';
3333

3434
/**
3535
* @var GetDetailsByAssetId

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/SaveDetails.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class SaveDetails extends Action implements HttpPostActionInterface
3232
/**
3333
* @see _isAllowed()
3434
*/
35-
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
35+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::media_gallery';
3636

3737
/**
3838
* @var UpdateAsset

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Upload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Upload extends Action implements HttpPostActionInterface
2828
/**
2929
* @see _isAllowed()
3030
*/
31-
public const ADMIN_RESOURCE = 'Magento_MediaGallery::upload_assets';
31+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::upload_assets';
3232

3333
/**
3434
* @var UploadImage

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Index/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
class Index extends Action implements HttpGetActionInterface
2020
{
21-
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
21+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::media_gallery';
2222

2323
/**
2424
* @var LayoutFactory

‎app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class Index extends Action implements HttpGetActionInterface
2323
{
24-
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
24+
public const ADMIN_RESOURCE = 'Magento_MediaGalleryApi::media_gallery';
2525

2626
/**
2727
* @var Config

‎app/code/Magento/MediaGalleryUi/Ui/Component/Control/CreateFolder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
class CreateFolder implements ButtonProviderInterface
1515
{
16-
private const ACL_CREATE_FOLDER = 'Magento_MediaGallery::create_folder';
16+
private const ACL_CREATE_FOLDER = 'Magento_MediaGalleryApi::create_folder';
1717

1818
/**
1919
* @var AuthorizationInterface

‎app/code/Magento/MediaGalleryUi/Ui/Component/Control/DeleteAssets.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
class DeleteAssets implements ButtonProviderInterface
1515
{
16-
private const ACL_DELETE_ASSETS= 'Magento_MediaGallery::delete_assets';
16+
private const ACL_DELETE_ASSETS= 'Magento_MediaGalleryApi::delete_assets';
1717

1818
/**
1919
* @var AuthorizationInterface

‎app/code/Magento/MediaGalleryUi/Ui/Component/Control/DeleteFolder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
class DeleteFolder implements ButtonProviderInterface
1515
{
16-
private const ACL_DELETE_FOLDER = 'Magento_MediaGallery::delete_folder';
16+
private const ACL_DELETE_FOLDER = 'Magento_MediaGalleryApi::delete_folder';
1717

1818
/**
1919
* @var AuthorizationInterface

‎app/code/Magento/MediaGalleryUi/Ui/Component/Control/InsertAsstes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
class InsertAsstes implements ButtonProviderInterface
1515
{
16-
private const ACL_INSERT_ASSETS = 'Magento_MediaGallery::insert_assets';
16+
private const ACL_INSERT_ASSETS = 'Magento_MediaGalleryApi::insert_assets';
1717

1818
/**
1919
* @var AuthorizationInterface

‎app/code/Magento/MediaGalleryUi/Ui/Component/Control/UploadAssets.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
class UploadAssets implements ButtonProviderInterface
1515
{
16-
private const ACL_UPLOAD_ASSETS= 'Magento_MediaGallery::upload_assets';
16+
private const ACL_UPLOAD_ASSETS= 'Magento_MediaGalleryApi::upload_assets';
1717

1818
/**
1919
* @var AuthorizationInterface

‎app/code/Magento/MediaGalleryUi/Ui/Component/DirectoryTree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class DirectoryTree extends Container
1919
{
2020
private const ACL_IMAGE_ACTIONS = [
21-
'delete_folder' => 'Magento_MediaGallery::delete_folder'
21+
'delete_folder' => 'Magento_MediaGalleryApi::delete_folder'
2222
];
2323

2424
/**

‎app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
class Url extends Column
2424
{
2525
private const ACL_IMAGE_ACTIONS = [
26-
'insert_assets' => 'Magento_MediaGallery::insert_assets',
27-
'delete_assets' => 'Magento_MediaGallery::delete_assets'
26+
'insert_assets' => 'Magento_MediaGalleryApi::insert_assets',
27+
'delete_assets' => 'Magento_MediaGalleryApi::delete_assets'
2828
];
2929

3030
/**

‎app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Massactions/Massaction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
class Massaction extends Container
1818
{
1919
private const ACL_IMAGE_ACTIONS = [
20-
'delete_assets' => 'Magento_MediaGallery::delete_assets'
20+
'delete_assets' => 'Magento_MediaGalleryApi::delete_assets'
2121
];
2222

2323
/**

‎app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_MediaGalleryUi::media" title="Media" translate="title" module="Magento_MediaGalleryUi" sortOrder="15" parent="Magento_Backend::content" resource="Magento_Cms::media_gallery" dependsOnConfig="system/media_gallery/enabled"/>
11-
<add id="Magento_MediaGalleryUi::media_gallery" title="Media Gallery" translate="title" module="Magento_MediaGalleryUi" sortOrder="0" parent="Magento_MediaGalleryUi::media" action="media_gallery/media/index" resource="Magento_Cms::media_gallery"/>
10+
<add id="Magento_MediaGalleryUi::media" title="Media" translate="title" module="Magento_MediaGalleryUi" sortOrder="15" parent="Magento_Backend::content" resource="Magento_MediaGalleryApi::media_gallery" dependsOnConfig="system/media_gallery/enabled"/>
11+
<add id="Magento_MediaGalleryUi::media_gallery" title="Media Gallery" translate="title" module="Magento_MediaGalleryUi" sortOrder="0" parent="Magento_MediaGalleryUi::media" action="media_gallery/media/index" resource="Magento_MediaGalleryApi::media_gallery"/>
1212
</menu>
1313
</config>

‎app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_index_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block name="media.gallery.container"
1212
class="Magento\Backend\Block\Template"
1313
template="Magento_MediaGalleryUi::container.phtml"
14-
aclResource="Magento_Cms::media_gallery">
14+
aclResource="Magento_MediaGalleryApi::media_gallery">
1515
<container name="gallery.actions" htmlTag="div" htmlClass="page-main-actions">
1616
<block name="page.actions.toolbar" template="Magento_Backend::pageactions.phtml"/>
1717
</container>

‎app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</storageConfig>
4141
<updateUrl path="mui/index/render"/>
4242
</settings>
43-
<aclResource>Magento_Cms::media_gallery</aclResource>
43+
<aclResource>Magento_MediaGalleryApi::media_gallery</aclResource>
4444
<dataProvider class="Magento\MediaGalleryUi\Model\Listing\DataProvider" name="media_gallery_listing_data_source">
4545
<settings>
4646
<requestFieldName>id</requestFieldName>

‎app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</storageConfig>
3434
<updateUrl path="mui/index/render"/>
3535
</settings>
36-
<aclResource>Magento_Cms::media_gallery</aclResource>
36+
<aclResource>Magento_MediaGalleryApi::media_gallery</aclResource>
3737
<dataProvider class="Magento\MediaGalleryUi\Model\Listing\DataProvider" name="media_gallery_listing_data_source">
3838
<settings>
3939
<requestFieldName>id</requestFieldName>

0 commit comments

Comments
 (0)