MAGETWO-85314: Add more granular ACL control over cache management in admin panel magento-partners/magento2ce#78

Volodymyr Kublytskyi · Volodymyr Kublytskyi · commit 97fac9f67b8e · 2018-02-01T15:01:09.000+02:00
- fixed block arguments issue
 - fixed code style
diff --git a/app/code/Magento/Backend/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php
@@ -45,7 +45,6 @@ protected function _construct()
                 ]
             );
         }
-
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Cache/Permissions.php b/app/code/Magento/Backend/Block/Cache/Permissions.php
@@ -7,11 +7,12 @@
 namespace Magento\Backend\Block\Cache;
 
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
  * Class Permissions
  */
-class Permissions
+class Permissions implements ArgumentInterface
 {
     /**
      * @var AuthorizationInterface
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -6,10 +6,10 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var \Magento\Backend\Block\Cache\Permissions $permissions */
+/** @var \Magento\Backend\Block\Cache\Permissions|null $permissions */
 $permissions = $block->getData('permissions');
 ?>
-<?php if ($block->hasAccessToAdditionalActions()): ?>
+<?php if ($permissions && $permissions->hasAccessToAdditionalActions()): ?>
     <div class="additional-cache-management">
         <?php if ($permissions->hasAccessToFlushCatalogImages()): ?>
             <h2>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ protected function _construct()`
`45`	`45`	`]`
`46`	`46`	`);`
`47`	`47`	`}`
`48`		`-`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`/**`