Code style improvements

magento · Aug 28, 2020 · 43fd057 · 43fd057
1 parent 8cdcefd
commit 43fd057
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoryTree.php b/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoryTree.php
@@ -17,7 +17,9 @@
  */
 class DirectoryTree extends Container
 {
-    private const ACL_DELETE_FOLDER = 'Magento_MediaGallery::delete_folder';
+    private const ACL_IMAGE_ACTIONS = [
+        'delete_folder' => 'Magento_MediaGallery::delete_folder'
+    ];
 
     /**
      * @var UrlInterface
@@ -70,15 +72,17 @@ public function prepare(): void
         );
     }
 
+
     /**
      * Return allowed actions for media gallery
      */
     private function getAllowedActions(): array
     {
         $allowedActions = [];
-
-        if ($this->authorization->isAllowed(self::ACL_DELETE_FOLDER)) {
-            $allowedActions[] = 'delete_folder';
+        foreach (self::ACL_IMAGE_ACTIONS as $key => $action) {
+            if ($this->authorization->isAllowed($action)) {
+                $allowedActions[] = $key;
+            }
         }
 
         return $allowedActions;

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js
@@ -57,9 +57,7 @@ define([
 
             if (!this.allowedActions.includes('delete_assets')) {
                 $.async('.media-gallery-delete-assets', function () {
-                    $('.media-gallery-delete-assets').attr('click', '#')
-                        .unbind('click')
-                        .addClass('action-disabled');
+                    $('.media-gallery-delete-assets').unbind('click').addClass('action-disabled');
                 });
             }