#1 resolving of eav attribute codes to names

Author: mryvlin

app/code/community/Firegento/AdminLogger/Block/Adminhtml/History/Grid.php

@@ -180,7 +180,8 @@ public function showNewContent($newContent, Firegento_AdminLogger_Model_History
                 }
                 foreach ($showContent as $key => $value ) {
                     if (array_key_exists($key, $newContent)) {
-                        $cell .= $this->formatCellContent($key, $newContent[$key]);
+                        $attributeName = Mage::helper('firegento_adminlogger')->getAttributeNameByTypeAndCode($row->getObjectType(), $key);
+                        $cell .= $this->formatCellContent($attributeName, $newContent[$key]);
                     }
                 }
             }
@@ -189,14 +190,20 @@ public function showNewContent($newContent, Firegento_AdminLogger_Model_History
     }
 
 
-    public function showOldContent($oldContent) {
+    /**
+     * @param string $oldContent
+     * @param Firegento_AdminLogger_Model_History $row
+     * @return string
+     */
+    public function showOldContent($oldContent, Firegento_AdminLogger_Model_History $row) {
         $cell = '';
         $oldContent = $this->decodeContent($oldContent);
 
         if (is_array($oldContent)) {
            if (count($oldContent) > 0) {
                foreach ($oldContent as $key => $value ) {
-                   $cell .= $this->formatCellContent($key, $value);
+                   $attributeName = Mage::helper('firegento_adminlogger')->getAttributeNameByTypeAndCode($row->getObjectType(), $key);
+                   $cell .= $this->formatCellContent($attributeName, $value);
                }
            } else {
                return $this->__('not available');

app/code/community/Firegento/AdminLogger/Helper/Data.php

@@ -9,4 +9,47 @@ class Firegento_AdminLogger_Helper_Data extends Mage_Core_Helper_Abstract
     const ACTION_INSERT = 1;
     const ACTION_UPDATE = 2;
     const ACTION_DELETE = 3;
+
+    /**
+     * returns attribute type by provided class name
+     *
+     * @param string $className
+     * @return string|bool
+     */
+    protected function getAttributeTypeByClassName($className){
+        /** @var Mage_Eav_Model_Resource_Entity_Type_Collection $typesCollection */
+        $typesCollection = Mage::getModel('eav/entity_type')->getCollection();
+        foreach ($typesCollection->getItems() as $type){
+            /** @var Mage_Eav_Model_Entity_Type $type */
+            if ($type->getEntityModel() && Mage::getModel($type->getEntityModel()) instanceof $className){
+                return $type->getEntityTypeCode();
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * returns attribute name by provided class name and attribute code
+     *
+     * @param string $className
+     * @param string $attributeCode
+     * @return string
+     */
+    public function getAttributeNameByTypeAndCode($className, $attributeCode) {
+
+        $attributeName = $attributeCode;
+
+        $type = $this->getAttributeTypeByClassName($className);
+        if ($type) {
+            /** @var Mage_Eav_Model_Entity_Attribute $attribute */
+            $attribute = Mage::getModel('eav/entity_attribute')->loadByCode($type, $attributeCode);
+            if ($attribute->getFrontendLabel()){
+                $attributeName = $attribute->getFrontendLabel();
+            }
+        }
+
+        return $attributeName;
+    }
+
 }