Acl corrected

swissup · Jun 30, 2016 · 56d73ca · 56d73ca
1 parent 6c7b17d
commit 56d73ca
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 33 deletions.
diff --git a/Controller/Adminhtml/Index/Delete.php b/Controller/Adminhtml/Index/Delete.php
@@ -3,6 +3,10 @@
 
 class Delete extends \Magento\Backend\App\Action
 {
+    /**
+     * Admin resource
+     */
+    const ADMIN_RESOURCE = 'Swissup_Easytabs::delete';
     /**
      * Core registry
      *
@@ -20,13 +24,6 @@ public function __construct(\Magento\Backend\App\Action\Context $context,
         $this->_coreRegistry = $coreRegistry;
         parent::__construct($context);
     }
-    /**
-     * {@inheritdoc}
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Swissup_Easytabs::delete');
-    }
     /**
      * Delete action
      *

diff --git a/Controller/Adminhtml/Index/Edit.php b/Controller/Adminhtml/Index/Edit.php
@@ -5,6 +5,10 @@
 
 class Edit extends Action
 {
+    /**
+     * Admin resource
+     */
+    const ADMIN_RESOURCE = 'Swissup_Easytabs::easytabs';
     /**
      * Core registry
      *
@@ -32,14 +36,6 @@ public function __construct(
         parent::__construct($context);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Swissup_Easytabs::save');
-    }
-
     /**
      * Init actions
      *

diff --git a/Controller/Adminhtml/Index/MassDelete.php b/Controller/Adminhtml/Index/MassDelete.php
@@ -11,6 +11,10 @@
  */
 class MassDelete extends \Magento\Backend\App\Action
 {
+    /**
+     * Admin resource
+     */
+    const ADMIN_RESOURCE = 'Swissup_Easytabs::delete';
     /**
      * @var Filter
      */

diff --git a/Controller/Adminhtml/Index/MassDisable.php b/Controller/Adminhtml/Index/MassDisable.php
@@ -13,6 +13,11 @@ class MassDisable extends AbstractMassStatus
      */
     const ID_FIELD = 'tab_id';
 
+    /**
+     * Admin resource
+     */
+    const ADMIN_RESOURCE = 'Swissup_Easytabs::status';
+
     /**
      * Resource collection
      *

diff --git a/Controller/Adminhtml/Index/MassEnable.php b/Controller/Adminhtml/Index/MassEnable.php
@@ -13,6 +13,11 @@ class MassEnable extends AbstractMassStatus
      */
     const ID_FIELD = 'tab_id';
 
+    /**
+     * Admin resource
+     */
+    const ADMIN_RESOURCE = 'Swissup_Easytabs::status';
+
     /**
      * Resource collection
      *

diff --git a/Controller/Adminhtml/Index/NewAction.php b/Controller/Adminhtml/Index/NewAction.php
@@ -3,6 +3,10 @@
 
 class NewAction extends \Magento\Backend\App\Action
 {
+    /**
+     * Admin resource
+     */
+    const ADMIN_RESOURCE = 'Swissup_Easytabs::save';
     /**
      * @var \Magento\Backend\Model\View\Result\Forward
      */
@@ -20,14 +24,6 @@ public function __construct(
         parent::__construct($context);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Swissup_Easytabs::save');
-    }
-
     /**
      * Forward to edit
      *

diff --git a/Controller/Adminhtml/Index/Save.php b/Controller/Adminhtml/Index/Save.php
@@ -4,12 +4,9 @@
 class Save extends \Magento\Backend\App\Action
 {
     /**
-     * {@inheritdoc}
+     * Admin resource
      */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Swissup_Easytabs::save');
-    }
+    const ADMIN_RESOURCE = 'Swissup_Easytabs::save';
 
     /**
      * Save action

diff --git a/etc/acl.xml b/etc/acl.xml
@@ -3,11 +3,13 @@
     <acl>
         <resources>
             <resource id="Magento_Backend::admin">
-                <resource id="Swissup_Core::swissup">
-                    <resource id="Swissup_Easytabs::easytabs" title="Easy Tabs" sortOrder="0">
-                        <resource id="Swissup_Easytabs::save" title="Save" sortOrder="10" />
-                        <resource id="Swissup_Easytabs::delete" title="Delete" sortOrder="20" />
-                        <resource id="Swissup_Easytabs::status" title="Change Status" sortOrder="30" />
+                <resource id="Swissup_Core::swissup" title="Swissup">
+                    <resource id="Swissup_Core::general" title="General">
+                        <resource id="Swissup_Easytabs::easytabs" title="Easy Tabs" sortOrder="0">
+                            <resource id="Swissup_Easytabs::save" title="Save" sortOrder="10" />
+                            <resource id="Swissup_Easytabs::delete" title="Delete" sortOrder="20" />
+                            <resource id="Swissup_Easytabs::status" title="Change Status" sortOrder="30" />
+                        </resource>
                     </resource>
                 </resource>
             </resource>