Merge pull request #27 from peterjaap/develop

Enabled logging for Mage_Admin_Model_User and Mage_Admin_Model_Roles.…

Author: Kevin

src/app/code/community/FireGento/AdminMonitoring/Model/History/Data.php

@@ -70,6 +70,8 @@ public function getContent()
         }
         $model->load($this->_savedModel->getId());
 
+        Mage::dispatchEvent('firegento_adminmonitoring_enrich_model_content', ['object' => $model]);
+
         return $this->_filterObligatoryFields($model->getData());
     }
 
@@ -96,9 +98,11 @@ protected function _filterObligatoryFields($data)
      */
     public function getOrigContent()
     {
-        $data = $this->_savedModel->getOrigData();
+        $data = new Varien_Object($this->_savedModel->getOrigData());
+
+        Mage::dispatchEvent('firegento_adminmonitoring_enrich_model_orig_content', ['data_object' => $data, 'model_object' => $this->_savedModel]);
 
-        return $this->_filterObligatoryFields($data);
+        return $this->_filterObligatoryFields($data->getData());
     }
 
     /**

src/app/code/community/FireGento/AdminMonitoring/Model/Observer/Enrich/Content.php

@@ -0,0 +1,18 @@
+<?php
+
+class FireGento_AdminMonitoring_Model_Observer_Enrich_Content {
+
+    public function enrich(Varien_Event_Observer $observer)
+    {
+        $model = $observer->getObject();
+
+        if ($model instanceof Mage_Admin_Model_Roles) {
+            $model->setResourcesList2D($model->getResourcesList2D());
+        }
+
+        if ($model instanceof Mage_Admin_Model_User) {
+            $model->setRoles($model->getRoles());
+        }
+    }
+
+}

src/app/code/community/FireGento/AdminMonitoring/Model/Observer/Enrich/OrigContent.php

@@ -0,0 +1,19 @@
+<?php
+
+class FireGento_AdminMonitoring_Model_Observer_Enrich_OrigContent {
+
+    public function enrich(Varien_Event_Observer $observer)
+    {
+        $data = $observer->getDataObject();
+        $class = $observer->getModelObject();
+
+        if ($class instanceof Mage_Admin_Model_Roles) {
+            $data->setResourcesList2D($class->getResourcesList2D());
+        }
+
+        if ($class instanceof Mage_Admin_Model_User) {
+            $data->setRoles($class->getRoles());
+        }
+    }
+
+}

src/app/code/community/FireGento/AdminMonitoring/etc/adminmonitoring.xml

@@ -4,7 +4,6 @@
         <excludes>
             <object_types>
                 <Mage_Index_Model_Event/>
-                <Mage_Admin_Model_User/>
                 <Enterprise_Logging_Model_Event_Changes/>
                 <Enterprise_Logging_Model_Event/>
                 <!-- omit infinite loops -->

src/app/code/community/FireGento/AdminMonitoring/etc/config.xml

@@ -143,6 +143,22 @@
                     </firegento_adminmonitoring>
                 </observers>
             </firegento_adminmonitoring_log>
+            <firegento_adminmonitoring_enrich_model_content>
+                <observers>
+                    <firegento_adminmonitoring>
+                        <class>FireGento_AdminMonitoring_Model_Observer_Enrich_Content</class>
+                        <method>enrich</method>
+                    </firegento_adminmonitoring>
+                </observers>
+            </firegento_adminmonitoring_enrich_model_content>
+            <firegento_adminmonitoring_enrich_model_orig_content>
+                <observers>
+                    <firegento_adminmonitoring>
+                        <class>FireGento_AdminMonitoring_Model_Observer_Enrich_OrigContent</class>
+                        <method>enrich</method>
+                    </firegento_adminmonitoring>
+                </observers>
+            </firegento_adminmonitoring_enrich_model_orig_content>
             <admin_session_user_login_success>
                 <observers>
                     <firegento_adminmonitoring>