Changeset 12361

Timestamp:

1 Jan 2015, 21:56:40 (10 years ago)

Author:

Henrik Bettermann

Message:

Store 'terms and conditions' of products.

Location:

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

Files:

• products/browser.py (modified) (2 diffs)
• products/interfaces.py (modified) (1 diff)
• products/product.py (modified) (1 diff)
• products/tests/test_browser.py (modified) (1 diff)
• products/tests/test_export.py (modified) (2 diffs)
• utils/helpers.py (modified) (1 diff)

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

@@ -41 +41 @@
     FriendlyDatetimeDisplayWidget)
 from waeup.ikoba.browser.breadcrumbs import Breadcrumb
+from waeup.ikoba.utils.helpers import html2dict
 from waeup.ikoba.browser.pages import (
     delSubobjects, add_local_role, del_local_roles, msave,
@@ -189 +190 @@
             if not new:
                del data['options']
-        return msave(self, **data)
+        msave(self, **data)
+        # Save multilingual dict
+        tc = getattr(self.context, 'terms_and_conditions', None)
+        portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE
+        self.context.tc_dict = html2dict(tc, portal_language)
+        return 
 
     @action(_('Cancel'), validator=NullValidator)

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

@@ -90 +90 @@
         show_year = True,
         )
+
+    tc_dict = Attribute('Terms and Conditions as language dictionary with values in html format')
+
+    terms_and_conditions = schema.Text(
+        title = _(u'Terms and Conditions'),
+        required = False,
+        description = _(u'Multilingual content in HTML format'),
+        )

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

@@ -45 +45 @@
         'waeup.local.ProductManager',
         ]
+
+    def __init__(self, *args, **kw):
+        super(Product, self).__init__(*args, **kw)
+        self.tc_dict = {}
 
     @property

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

@@ -193 +193 @@
         self.assertEqual(self.browser.url, self.manage_product_path)
         self.browser.getControl(name="form.title").value = 'New license'
+        self.browser.getControl(name="form.terms_and_conditions").value = """
+<h1>Hello World</h1>
+>>de<<
+<h1>Hallo Welt</h1>
+"""
         self.browser.getControl("Save").click()
         self.assertEqual(self.app['products']['LIC'].title, 'New license')
+        # tc_dict has been saved
+        self.assertEqual(self.app['products']['LIC'].tc_dict,
+            {'de': u'<div id="html">\n<h1>Hallo Welt</h1>\n</div id="html">',
+             'en': u'<div id="html">\n<h1>Hello World</h1>\n</div id="html">'})
         # Managers can asign local roles
         self.browser.getControl(name="user").value = ['john']

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

@@ -63 +63 @@
         self.assertTrue(
             'contract_category,contract_title,options,'
-            'product_id,title,valid_from,valid_to,users_with_local_roles\r\n'
-            'license,,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",LIC,Unnamed'
+            'product_id,terms_and_conditions,title,valid_from,valid_to,users_with_local_roles\r\n'
+            'license,,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",LIC,,Unnamed'
             ',2015-12-04#,,"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'
@@ -78 +78 @@
         self.assertTrue(
             'contract_category,contract_title,options,'
-            'product_id,title,valid_from,valid_to,users_with_local_roles\r\n'
-            'license,,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",LIC,Unnamed'
+            'product_id,terms_and_conditions,title,valid_from,valid_to,users_with_local_roles\r\n'
+            'license,,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",LIC,,Unnamed'
             ',2015-12-04#,,"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/helpers.py

@@ -823 +823 @@
     for part in parts:
         if part[2:4] == u'<<':
-            lang = part[0:2].lower()
+            lang = str(part[0:2].lower())
             text = part[4:]
             elements[lang] = renderElement(u'div id="html"',