Merge lp:~camptocamp/openerp-connector-magento/7.0-image-1258418-gbr into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

[Guewen Baconnier @ Camptocamp]

[FIX] the main image has the 'image' type, not 'base'

Fixes lp:1258418

[Stefaan Ferket (s-ferket)]

This one works perfect for us. It now takes the image that we expected.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

review: Approve (code review, no tests)

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2013-11-09 23:01:40 +0000
+++ magentoerpconnect/product.py	2013-12-18 19:33:00 +0000
@@ -259,7 +259,7 @@
 
     def _sort_images(self, images):
         """ Returns a list of images sorted by their priority.
-        An image with the 'base' type is the the primary one.
+        An image with the 'image' type is the the primary one.
         The other images are sorted by their position.
 
         The returned list is reversed, the items at the end
@@ -267,11 +267,11 @@
         """
         if not images:
             return {}
-        # place the images where the type is 'base' first then
+        # place the images where the type is 'image' first then
         # sort them by the reverse priority (last item of the list has
         # the the higher priority)
         def priority(image):
-            primary = 'base' in image['types']
+            primary = 'image' in image['types']
             try:
                 position = int(image['position'])
             except ValueError:

=== modified file 'magentoerpconnect/tests/test_import_product_image.py'
--- magentoerpconnect/tests/test_import_product_image.py	2013-09-03 09:55:45 +0000
+++ magentoerpconnect/tests/test_import_product_image.py	2013-12-18 19:33:00 +0000
@@ -70,7 +70,7 @@
         """ Check if the images are sorted in the correct priority """
         env = mock.Mock()
         importer = CatalogImageImporter(env)
-        file1 = {'file': 'file1', 'types': ['base'], 'position': '10'}
+        file1 = {'file': 'file1', 'types': ['image'], 'position': '10'}
         file2 = {'file': 'file2', 'types': ['thumbnail'], 'position': '3'}
         file3 = {'file': 'file3', 'types': ['thumbnail'], 'position': '4'}
         file4 = {'file': 'file4', 'types': [], 'position': '10'}