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

Timestamp:

2 Dec 2014, 14:38:31 (10 years ago)

Author:

Henrik Bettermann

Message:

Implement HREFDisplayWidget which renders a persistent object title inside an anchor element
referring to the object.

Location:

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

Files:

• customers/browser.py (modified) (3 diffs)
• customers/interfaces.py (modified) (5 diffs)
• customers/tests/test_browser.py (modified) (6 diffs)
• widgets/hrefwidget.py (added)

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

@@ -47 +47 @@
 from waeup.ikoba.browser.interfaces import ICaptchaManager
 from waeup.ikoba.mandates.mandate import PasswordMandate
+from waeup.ikoba.widgets.hrefwidget import HREFDisplayWidget
 from waeup.ikoba.utils.helpers import get_current_principal, to_timezone, now
 from waeup.ikoba.customers.interfaces import (
@@ -68 +69 @@
     if changed_fields:
         changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
-    if 'product' in changed_fields and data['product'] is not None:
-        view.context.last_product_id = data['product'].product_id
+    if 'product_object' in changed_fields and data['product_object'] is not None:
+        view.context.last_product_id = data['product_object'].product_id
         notify(grok.ObjectModifiedEvent(view.context))
     fields_string = ' + '.join(changed_fields)
@@ -1155 +1156 @@
     @property
     def form_fields(self):
-        return grok.AutoFields(self.context.form_fields_interface).omit(
+        form_fields = grok.AutoFields(self.context.form_fields_interface).omit(
             'last_transition_date')
+        for field in form_fields:
+            if field.__name__.endswith('_object'):
+                form_fields[field.__name__].custom_widget = HREFDisplayWidget
+        return form_fields
 
     @property

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

@@ -288 +288 @@
         )
 
-    product = schema.Choice(
+    product_object = schema.Choice(
         title = _(u'Product'),
         source = ConCatProductSource(),
@@ -300 +300 @@
     """
 
-    product = schema.Choice(
+    product_object = schema.Choice(
         title = _(u'Product'),
         source = ConCatProductSource(),
@@ -312 +312 @@
     """
 
-    document = schema.Choice(
+    document_object = schema.Choice(
         title = _(u'Document'),
         source = CustomerDocumentSource(),
@@ -324 +324 @@
     """
 
-    product = schema.Choice(
+    product_object = schema.Choice(
         title = _(u'Product'),
         source = ConCatProductSource(),
@@ -330 +330 @@
         )
 
-    document = schema.Choice(
+    document_object = schema.Choice(
         title = _(u'Document'),
         source = CustomerDocumentSource(),

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

@@ -1074 +1074 @@
         self.browser.getLink("c102").click()
         self.browser.getLink("Manage").click()
-        self.browser.getControl(name="form.product").value = ['SAM']
+        self.browser.getControl(name="form.product_object").value = ['SAM']
         self.browser.getControl(name="form.title").value = 'My second contract'
         self.browser.getControl("Save").click()
@@ -1134 +1134 @@
         contract = self.customer['contracts']['c102']
         # Contract can be edited ...
-        self.browser.getLink("c102").click()
         self.browser.open(self.contracts_path + '/c102/edit')
         #self.browser.getLink("Edit").click()
@@ -1148 +1147 @@
         # So far last_product_id is None.
         self.assertTrue(self.customer['contracts']['c102'].last_product_id is None)
-        self.browser.getControl(name="form.product").value = ['SAM']
+        self.browser.getControl(name="form.product_object").value = ['SAM']
         self.browser.getControl("Save").click()
         # Document is a required field on edit form page.
@@ -1157 +1156 @@
         IWorkflowState(self.document).setState(SUBMITTED)
         self.browser.open(self.contracts_path + '/c102/edit')
-        self.browser.getControl(name="form.product").value = ['SAM']
-        self.browser.getControl(name="form.document").value = ['d101']
+        self.browser.getControl(name="form.product_object").value = ['SAM']
+        self.browser.getControl(name="form.document_object").value = ['d101']
         self.browser.getControl(name="form.title").value = 'My second contract'
         self.browser.getControl("Save").click()
@@ -1165 +1164 @@
         self.assertEqual(self.customer['contracts']['c102'].last_product_id, 'SAM')
         self.assertEqual(contract.title, 'My second contract')
-        self.assertEqual(contract.product, self.product)
-        self.assertEqual(contract.document, self.document)
+        self.assertEqual(contract.product_object, self.product)
+        self.assertEqual(contract.document_object, self.document)
         # Saving the form again does not unset last_product_id
         self.browser.getControl(name="form.title").value = 'My third contract'
@@ -1174 +1173 @@
         self.browser.getLink("View").click()
         self.assertEqual(self.browser.url, self.contracts_path + '/c102/index')
+        # An href attribute is referring to the document and product objects
+        self.assertTrue('<a href="http://localhost/app/products/SAM">SAM -'
+            in self.browser.contents)
+        self.assertTrue(
+            '<a href="http://localhost/app/customers/K1000000/documents/d101">d101 -'
+            in self.browser.contents)
         # Customer can submit the form. The form is also saved.
         self.browser.getLink("Edit").click()