Changeset 12340 for main/waeup.ikoba/trunk

Timestamp:

30 Dec 2014, 09:05:47 (10 years ago)

Author:

Henrik Bettermann

Message:

Check and add stored options first before adding recent product options.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py

@@ -187 +187 @@
 
     def getValues(self, context):
-        product = getattr(context, 'product_object', None)
-        if product is None:
-            return []
-        return product.options
+        options = []
+        recent_options = getattr(
+            getattr(context, 'product_object', None), 'options', [])
+        # Check and add stored options first before adding recent
+        # product options.
+        if context.product_options:
+            for stored_option in context.product_options:
+                if stored_option not in recent_options:
+                    options.append(stored_option)
+        options += recent_options
+        return options
 
     def getToken(self, context, value):