Changeset 12318

Timestamp:

25 Dec 2014, 18:23:17 (10 years ago)

Author:

Henrik Bettermann

Message:

#Remove unchanged product options from data when saving the form.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)

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

@@ -177 +177 @@
     @action(_('Save'), style='primary')
     def save(self, **data):
-        ##: ToDo Remove unchanged product options from 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']
         return msave(self, **data)
 

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/test_browser.py

@@ -23 +23 @@
 import pytz
 import base64
+from decimal import Decimal
 from datetime import datetime, timedelta, date
 from StringIO import StringIO
@@ -43 +44 @@
 from waeup.ikoba.tests.test_async import FunctionalAsyncTestCase
 from waeup.ikoba.browser.tests.test_pdf import samples_dir
+from waeup.ikoba.products.productoptions import ProductOptionEntry
 
 def lookup_submit_value(name, value, browser):
@@ -83 +85 @@
         # to access grok.getSite() and should get our new app then
         setSite(app)
+
+        self.logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'main.log')
 
         # Add user
@@ -211 +216 @@
             None)
         return
+
+    def test_product_options(self):
+        prodoptions = ProductOptionEntry()
+        prodoptions.title = u'My option'
+        prodoptions.fee = Decimal('99.9')
+        prodoptions.currency = 'usd'
+        self.product.options = [prodoptions,]
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.product_path)
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.product.options[0], prodoptions)
+        self.browser.open(self.manage_product_path)
+        self.browser.getControl("Save").click()
+        # applyData must not exchange the object
+        self.assertEqual(self.product.options[0], prodoptions)
+        # and thus not add a logging message (the log file
+        # do not even exist so far)
+        self.assertRaises(IOError, open, self.logfile, 'read')
+        # Now we change the content after opening the manage page
+        self.browser.open(self.manage_product_path)
+        prodoptions.title = u'My new option'
+        self.assertEqual(self.product.options[0].title, 'My new option')
+        # but save the opened form with the old data.
+        self.browser.getControl("Save").click()
+        # The object has been replaced,
+        self.assertTrue(self.product.options[0] != prodoptions)
+        # the old title has been restored
+        self.assertEqual(self.product.options[0].title, 'My option')
+        # and a logging message has been added.
+        logcontent = open(self.logfile).read()
+        self.assertTrue('saved: options' in logcontent)