Changeset 12419 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

8 Jan 2015, 10:33:18 (10 years ago)

Author:

Henrik Bettermann

Message:

Do not compare ResultEntry? objects but their attributes. Then we do not need to remove unchanged product options from data.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• interfaces.py (modified) (1 diff)
• products/browser.py (modified) (1 diff)
• products/productoptions.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/interfaces.py

@@ -120 +120 @@
     return True
 
-# Define a validation method for email addresses
+# Define a validation method for ids
 class NotIdValue(schema.ValidationError):
     __doc__ = u"Invalid id"

main/waeup.ikoba/trunk/src/waeup/ikoba/products/browser.py

@@ -197 +197 @@
     @action(_('Save'), style='primary')
     def save(self, **data):
-        # Remove unchanged product options from data
-        new_options = data.get('options')
-        if new_options and (len(new_options) == len (self.context.options)):
-            new = False
-            for i in range(len(new_options)):
-                new_option_str = new_options[i].to_string()
-                stored_options_str = self.context.options[i].to_string()
-                if new_option_str != stored_options_str:
-                    new = True
-                    break
-            if not new:
-               del data['options']
         msave(self, **data)
         # Save multilingual dict

main/waeup.ikoba/trunk/src/waeup/ikoba/products/productoptions.py

@@ -77 +77 @@
         return
 
+    def __eq__(self, obj):
+        default = object()
+        result = []
+        for name in ('title', 'fee', 'currency',):
+            result.append(
+                getattr(self, name) == getattr(obj, name, default))
+        return False not in result
+
     def to_string(self):
         """A string representation that can be used in exports.