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

Timestamp:

18 Jan 2015, 15:59:43 (10 years ago)

Author:

Henrik Bettermann

Message:

Do not set contract_category default values.

product_object is not an editable attribute of any kind of contract.

Location:

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

Files:

• customers/interfaces.py (modified) (1 diff)
• products/interfaces.py (modified) (1 diff)
• products/tests/test_batching.py (modified) (2 diffs)
• products/tests/test_browser.py (modified) (2 diffs)

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

@@ -376 +376 @@
     """
 
-    product_object = schema.Choice(
-        title = _(u'Product'),
-        source = ConCatProductSource(),
-        required = True,
-        )
-
     document_object = schema.Choice(
         title = _(u'Document'),

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

@@ -67 +67 @@
         title = _(u'Contract Category'),
         source = ConCatSource(),
-        default = u'license',
         required = True,
         )

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

@@ -59 +59 @@
     layer = FunctionalLayer
 
+    _contract_category = u'license'
+
     def setUp(self):
         super(ProductImportExportSetup, self).setUp()
@@ -83 +85 @@
         product = Product()
         product.product_id = u'LIC'
+        product.contract_category = self._contract_category
         options = ProductOption()
         options.title = u'Base Fee'

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

@@ -100 +100 @@
             NotIdValue, setattr, self.product, 'product_id', u'id with spaces')
         self.product.title = u'Our License'
+        self.product.contract_category = u'license'
         self.product.valid_from = date(2015, 12, 4)
         self.app['products'].addProduct(self.product)
@@ -157 +158 @@
         self.browser.getControl(name="form.product_id").value = 'bob'
         self.browser.getControl(name="form.title").value = 'My product'
+        self.browser.getControl(name="form.contract_category").value = ['license']
         self.browser.getControl("Create product").click()
         self.assertTrue('Product bob added' in self.browser.contents)