Import Magento Release 1.6.0.0-beta1

Also fixing the .gitignore file to stop leaving out files
winman · Jul 3, 2011 · 1efcc40 · 1efcc40
1 parent a562c7f
commit 1efcc40
Show file tree

Hide file tree

Showing 493 changed files with 34,346 additions and 6,286 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1 @@
-# git-ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-
-# Dynamic data that doesn't need to be in the repo
-/var/*
-/media/*
-/app/etc/use_cache.ser
-local.xml
+/app/etc/local.xml
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
diff --git a/app/Mage.php b/app/Mage.php
@@ -154,7 +154,7 @@ public static function getVersionInfo()
             'minor'     => '6',
             'revision'  => '0',
             'patch'     => '0',
-            'stability' => 'alpha',
+            'stability' => 'beta',
             'number'    => '1',
         );
     }

diff --git a/app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes.php b/app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes/Edit/Form.php b/app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes/Edit/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Block/Adminhtml/List/Codes.php b/app/code/community/Find/Feed/Block/Adminhtml/List/Codes.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Block/Adminhtml/List/Codes/Grid.php b/app/code/community/Find/Feed/Block/Adminhtml/List/Codes/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Block/Adminhtml/List/Items.php b/app/code/community/Find/Feed/Block/Adminhtml/List/Items.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Block/Adminhtml/List/Items/Grid.php b/app/code/community/Find/Feed/Block/Adminhtml/List/Items/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Helper/Data.php b/app/code/community/Find/Feed/Helper/Data.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Adminhtml/System/Source/Cron/Frequency.php b/app/code/community/Find/Feed/Model/Adminhtml/System/Source/Cron/Frequency.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Adminhtml/System/Source/Cron/Hours.php b/app/code/community/Find/Feed/Model/Adminhtml/System/Source/Cron/Hours.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Codes.php b/app/code/community/Find/Feed/Model/Codes.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Import.php b/app/code/community/Find/Feed/Model/Import.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -45,6 +45,13 @@ class Find_Feed_Model_Import extends Mage_Core_Model_Abstract
 
     const XML_NODE_FIND_FEED_ATTRIBUTES = 'find_feed_attributes';
 
+    /**
+     * Attribute sources
+     *
+     * @var array
+     */
+    protected $_attributeSources = array();
+
     /**
      * Cron action
      */
@@ -108,7 +115,11 @@ protected function _createFile()
             foreach ($productCollection as $product) {
                 $attributesRow = array();
                 foreach ($attributes as $key => $value) {
-                    $attributesRow[$key] = $product->getData($value);
+                    if ($this->_checkAttributeSource($product, $value)) {
+                        $attributesRow[$key] = $product->getAttributeText($value);
+                    } else {
+                        $attributesRow[$key] = $product->getData($value);
+                    }
                 }
                 $file->streamWriteCsv($attributesRow, self::SEPARATOR, self::ENCLOSURE);
             }
@@ -124,6 +135,21 @@ protected function _createFile()
         return false;
     }
 
+    /**
+     * Check attribute source
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param string $value
+     * @return bool
+     */
+    protected function _checkAttributeSource($product, $value)
+    {
+        if (!array_key_exists($value, $this->_attributeSources)) {
+            $this->_attributeSources[$value] = $product->getResource()->getAttribute($value)->usesSource();
+        }
+        return $this->_attributeSources[$value];
+    }
+
     /**
      * List import codes (attribute map) model
      *

diff --git a/app/code/community/Find/Feed/Model/Mysql4/Codes.php b/app/code/community/Find/Feed/Model/Mysql4/Codes.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Mysql4/Codes/Collection.php b/app/code/community/Find/Feed/Model/Mysql4/Codes/Collection.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Mysql4/Setup.php b/app/code/community/Find/Feed/Model/Mysql4/Setup.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Observer.php b/app/code/community/Find/Feed/Model/Observer.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Resource/Codes.php b/app/code/community/Find/Feed/Model/Resource/Codes.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Resource/Codes/Collection.php b/app/code/community/Find/Feed/Model/Resource/Codes/Collection.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/Model/Resource/Setup.php b/app/code/community/Find/Feed/Model/Resource/Setup.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/controllers/Adminhtml/Codes/GridController.php b/app/code/community/Find/Feed/controllers/Adminhtml/Codes/GridController.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/controllers/Adminhtml/Items/GridController.php b/app/code/community/Find/Feed/controllers/Adminhtml/Items/GridController.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/etc/adminhtml.xml b/app/code/community/Find/Feed/etc/adminhtml.xml
@@ -20,7 +20,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */

diff --git a/app/code/community/Find/Feed/etc/config.xml b/app/code/community/Find/Feed/etc/config.xml
@@ -20,7 +20,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */

diff --git a/app/code/community/Find/Feed/etc/system.xml b/app/code/community/Find/Feed/etc/system.xml
@@ -20,7 +20,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */

diff --git a/app/code/community/Find/Feed/sql/find_feed_setup/install-1.6.0.0.php b/app/code/community/Find/Feed/sql/find_feed_setup/install-1.6.0.0.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/sql/find_feed_setup/mysql4-install-0.0.1.php b/app/code/community/Find/Feed/sql/find_feed_setup/mysql4-install-0.0.1.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/Find/Feed/sql/find_feed_setup/mysql4-upgrade-0.0.1-0.0.2.php b/app/code/community/Find/Feed/sql/find_feed_setup/mysql4-upgrade-0.0.1-0.0.2.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    
- * @package     _home
+ * @package     _storage
  * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php
@@ -129,11 +129,11 @@ protected function _prepareForm()
                     }
                 }
             }
+            $form->addValues($values);
+            $form->setFieldNameSuffix('product');
 
             Mage::dispatchEvent('adminhtml_catalog_product_edit_prepare_form', array('form'=>$form));
 
-            $form->addValues($values);
-            $form->setFieldNameSuffix('product');
             $this->setForm($form);
         }
     }