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

Timestamp:

3 Jan 2015, 21:31:04 (10 years ago)

Author:

Henrik Bettermann

Message:

Some modifications to enable customization.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests/test_batching.py (modified) (2 diffs)
• tests/test_browser.py (modified) (3 diffs)

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

@@ -1499 +1499 @@
     """Deliver pdf file including metadata.
     """
-    grok.context(ISampleContract)
+    grok.context(IContract)
     grok.name('contract_slip.pdf')
     grok.require('waeup.viewCustomer')
@@ -1507 +1507 @@
                    'suspended_comment',)
 
-    form_fields = grok.AutoFields(ISampleContract)
+    @property
+    def form_fields(self):
+        return grok.AutoFields(self.context.form_fields_interface)
 
     @property

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

@@ -84 +84 @@
     layer = FunctionalLayer
 
+    def setup_customizable_params(self):
+        self._contract_category = u'sample'
+        return
+
     def setUp(self):
         super(CustomerImportExportSetup, self).setUp()
+        self.setup_customizable_params()
         self.dc_root = tempfile.mkdtemp()
         self.workdir = tempfile.mkdtemp()
@@ -100 +105 @@
         self.product.product_id = u'SAM'
         self.product.title = u'Our Sample Product'
-        self.product.contract_category = u'sample'
+        self.product.contract_category = self._contract_category
         self.product.valid_from = datetime.date(2015, 12, 4)
         self.product.tc_dict = {'en': u'Hello world'}

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

@@ -83 +83 @@
     layer = FunctionalLayer
 
-    # This property has to be customied in custom packages.
-    # the sample category might not be available.
-    @property
-    def _contract_category(self):
-        return u'sample'
+    def setup_customizable_params(self):
+        self._contract_category = u'sample'
+        self._document_factory = 'waeup.CustomerSampleDocument'
+        self._contract_factory = 'waeup.SampleContract'
+        return
 
     def setUp(self):
         super(CustomersFullSetup, self).setUp()
-
+        self.setup_customizable_params()
         # Setup a sample site for each test
         app = Company()
@@ -133 +133 @@
         self.customer_id = customer.customer_id
         self.customer = self.app['customers'][self.customer_id]
-        self.document = createObject('waeup.CustomerSampleDocument')
+        self.document = createObject(self._document_factory)
         self.document.title = u'My first document'
         self.document.document_id = u'DOC1'
@@ -139 +139 @@
             NotIdValue, setattr, self.document, 'document_id', u'id with spaces')
         self.customer['documents'].addDocument(self.document)
-        self.contract = createObject('waeup.SampleContract')
+        self.contract = createObject(self._contract_factory)
         self.contract.contract_id = u'CON1'
         self.assertRaises(