move the config viewer_enabled to the general section because its n…

…ot only related to the database logger adapter
firegento · May 12, 2014 · 01ab8c8 · 01ab8c8
1 parent a176642
commit 01ab8c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/app/code/community/FireGento/Logger/controllers/Adminhtml/LoggerController.php b/src/app/code/community/FireGento/Logger/controllers/Adminhtml/LoggerController.php
@@ -124,7 +124,7 @@ public function reportAjaxAction()
      */
     protected function _isAllowed()
     {
-        $flagEnabled = Mage::getStoreConfigFlag('logger/db/viewer_enabled');
+        $flagEnabled = Mage::getStoreConfigFlag('logger/general/viewer_enabled');
         $flagAcl = Mage::getSingleton('admin/session')->isAllowed('system/logger');
 
         return $flagEnabled && $flagAcl;

diff --git a/src/app/code/community/FireGento/Logger/etc/adminhtml.xml b/src/app/code/community/FireGento/Logger/etc/adminhtml.xml
@@ -27,7 +27,7 @@
                     <sort_order>60</sort_order>
                     <action>adminhtml/logger/index</action>
                     <depends>
-                        <config>logger/db/viewer_enabled</config>
+                        <config>logger/general/viewer_enabled</config>
                     </depends>
                     <children>
                         <grid_viewer translate="title" module="firegento_logger">

diff --git a/src/app/code/community/FireGento/Logger/etc/config.xml b/src/app/code/community/FireGento/Logger/etc/config.xml
@@ -160,6 +160,7 @@ USER AGENT: %HTTP_USER_AGENT%
 FILE: %file%:%line%
 %message%]]></format>
                 <max_backtrace_lines>0</max_backtrace_lines>
+                <viewer_enabled>0</viewer_enabled>
             </general>
             <default>
                 <priority>default</priority>
@@ -172,7 +173,6 @@ FILE: %file%:%line%
             </mailconfig>
             <db>
                 <priority>default</priority>
-                <viewer_enabled>0</viewer_enabled>
                 <max_days_to_keep>45</max_days_to_keep>
             </db>
             <xmpp>

diff --git a/src/app/code/community/FireGento/Logger/etc/system.xml b/src/app/code/community/FireGento/Logger/etc/system.xml
@@ -102,6 +102,14 @@
                                 end of each page processing. <br />
                             ]]></comment>
                         </use_queue>
+                        <viewer_enabled translate="label">
+                            <label>Enable Log Viewer</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>10</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <comment>If "No", the "View Error Log" menu item will not be present.</comment>
+                        </viewer_enabled>
                     </fields>
                 </general>
                 <default translate="label">
@@ -196,14 +204,6 @@
                             <show_in_default>1</show_in_default>
                             <comment>Choose the lowest priority level to be logged.</comment>
                         </priority>
-                        <viewer_enabled translate="label">
-                            <label>Enable Log Viewer</label>
-                            <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_yesno</source_model>
-                            <sort_order>10</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <comment>If "No", the "View Error Log" menu item will not be present.</comment>
-                        </viewer_enabled>
                         <max_days_to_keep translate="label">
                             <label>Maximum days to keep log entries</label>
                             <frontend_type>text</frontend_type>