Changeset 12670

Timestamp:

6 Mar 2015, 18:37:06 (10 years ago)

Author:

Henrik Bettermann

Message:

Add a multilingual description field to products.

Location:

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

Files:

• documents/workflow.py (modified) (1 diff)
• products/browser.py (modified) (2 diffs)
• products/browser_templates/productpage.pt (modified) (1 diff)
• products/container.py (modified) (2 diffs)
• products/interfaces.py (modified) (1 diff)
• products/product.py (modified) (1 diff)
• products/tests/test_export.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/workflow.py

@@ -51 +51 @@
     Transition(
         transition_id = 'retract',
-        title = _('Retract documet'),
+        title = _('Retract document'),
         source = PUBLISHED,
         condition = NullCondition,

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

@@ -155 +155 @@
     @property
     def form_fields(self):
-        return grok.AutoFields(
-            self.context.form_fields_interface).omit('terms_and_conditions')
+        return grok.AutoFields(self.context.form_fields_interface).omit(
+            'terms_and_conditions', 'description')
 
     @property
     def label(self):
         return self.context.title
+
+    @property
+    def description(self):
+        lang = self.request.cookies.get('ikoba.language')
+        html = self.context.description_dict.get(lang,'')
+        if html =='':
+            portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE
+            html = self.context.description_dict.get(portal_language,'')
+        return html
 
     @property
@@ -198 +207 @@
     def save(self, **data):
         msave(self, **data)
-        # Save multilingual dict
+        # Save multilingual dicts
+        portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE
+        desc = getattr(self.context, 'description', None)
+        self.context.description_dict = html2dict(desc, portal_language)
         tc = getattr(self.context, 'terms_and_conditions', None)
-        portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE
         self.context.tc_dict = html2dict(tc, portal_language)
         return 

main/waeup.ikoba/trunk/src/waeup/ikoba/products/browser_templates/productpage.pt

@@ +1 @@
+<span tal:condition="view/description" tal:omit-tag="">
+  <p tal:content="structure view/description">Description</p>
+  <br />
+</span>
+
 <table class="form-table" i18n:domain="waeup.ikoba">
   <tbody>

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

@@ -21 +21 @@
 import grok
 from grok import index
+from waeup.ikoba.interfaces import IIkobaPluggable
 from waeup.ikoba.products.interfaces import IProductsContainer, IProduct
 from waeup.ikoba.utils.helpers import attrs_to_fields
@@ -40 +41 @@
 
 ProductsContainer = attrs_to_fields(ProductsContainer)
+
+
+class ContainerPlugin(grok.GlobalUtility):
+    """A plugin that creates container for Container inside a company.
+    """
+    grok.implements(IIkobaPluggable)
+    grok.name('productscontainer')
+
+    def setup(self, site, name, logger):
+        return
+
+    def update(self, site, name, logger):
+        container = site['products']
+        for value in container.values():
+            if not getattr(value, 'description_dict', None):
+                value.description_dict = {}
+        return

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

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

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

@@ -52 +52 @@
         super(Product, self).__init__(*args, **kw)
         self.tc_dict = {}
+        self.description_dict = {}
 
     @property

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

@@ -62 +62 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'contract_category,contract_title,options,'
+            'contract_category,contract_title,description,options,'
             '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'
+            'license,,,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",LIC,,Unnamed'
             ',2015-12-04#,,"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'
@@ -77 +77 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'contract_category,contract_title,options,'
+            'contract_category,contract_title,description,options,'
             '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'
+            'license,,,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",LIC,,Unnamed'
             ',2015-12-04#,,"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'