Merge branch 'hotfix/admin_access'

firegento · Jul 23, 2015 · 7c42a30 · 7c42a30
2 parents 901df62 + f296417
commit 7c42a30
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php
@@ -56,7 +56,7 @@ public function isInitialized()
      */
     public function getManageUrl()
     {
-        return $this->getUrl('magesetup/magesetup');
+        return $this->getUrl('adminhtml/magesetup');
     }
 
     /**

diff --git a/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/MagesetupController.php b/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/MagesetupController.php
@@ -134,4 +134,9 @@ protected function _getParams()
 
         return $params;
     }
+
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('system/magesetup');
+    }
 }
diff --git a/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php b/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php
@@ -74,4 +74,9 @@ public function gridAction()
             $this->getLayout()->createBlock('magesetup/adminhtml_newsletter_subscriber_status_grid')->toHtml()
         );
     }
+
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber_status');
+    }
 }
diff --git a/src/app/code/community/FireGento/MageSetup/etc/adminhtml.xml b/src/app/code/community/FireGento/MageSetup/etc/adminhtml.xml
@@ -26,15 +26,15 @@
                 <magesetup translate="title">
                     <title>MageSetup</title>
                     <sort_order>10</sort_order>
-                    <action>magesetup/magesetup</action>
+                    <action>adminhtml/magesetup</action>
                 </magesetup>
             </children>
         </system>
         <newsletter>
             <children>
                 <subscriber_status translate="title" module="magesetup">
                     <title>Newsletter Subscribers Status History</title>
-                    <action>magesetup/newsletter/</action>
+                    <action>adminhtml/newsletter</action>
                 </subscriber_status>
             </children>
         </newsletter>

diff --git a/src/app/code/community/FireGento/MageSetup/etc/config.xml b/src/app/code/community/FireGento/MageSetup/etc/config.xml
@@ -226,16 +226,13 @@
     </adminhtml>
     <admin>
         <routers>
-            <magesetup>
-                <use>admin</use>
+            <adminhtml>
                 <args>
-                    <module>FireGento_MageSetup</module>
-                    <frontName>magesetup</frontName>
                     <modules>
                         <FireGento_MageSetup after="Mage_Adminhtml">FireGento_MageSetup_Adminhtml</FireGento_MageSetup>
                     </modules>
                 </args>
-            </magesetup>
+            </adminhtml>
         </routers>
     </admin>
     <default>

diff --git a/src/app/design/adminhtml/default/default/layout/magesetup.xml b/src/app/design/adminhtml/default/default/layout/magesetup.xml
@@ -24,9 +24,9 @@
             <block type="magesetup/adminhtml_notifications" name="magesetup_notifications" template="magesetup/notifications.phtml" before="-" />
         </reference>
     </default>
-	<magesetup_magesetup_index>
+	<adminhtml_magesetup_index>
         <reference name="content">
             <block type="magesetup/adminhtml_magesetup" name="magesetup.index" template="magesetup/form.phtml"/>
         </reference>
-    </magesetup_magesetup_index>
+    </adminhtml_magesetup_index>
 </layout>