Changeset 12229 for main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Timestamp:

14 Dec 2014, 15:45:55 (10 years ago)

Author:

Henrik Bettermann

Message:

We do not need the HTMLDisplayWidget. Use simple helper function instead. Tests will follow.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/documents/browser.py (modified) (2 diffs)

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

@@ -32 +32 @@
 from zope.schema.interfaces import ConstraintNotSatisfied, RequiredMissing
 from zope.formlib.textwidgets import BytesDisplayWidget
-from zope.formlib.widget import renderElement
 from zope.security import checkPermission
+from waeup.ikoba.utils.helpers import html2dict
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.interfaces import (
@@ -233 +233 @@
     grok.context(IHTMLDocument)
 
-    def _html_dict(self):
-        value = getattr(self.context, 'html_multilang', None)
-        if not value:
-            return {}
-        parts = value.split('>>')
-        elements = {}
-        lang = getUtility(IIkobaUtils).PORTAL_LANGUAGE
-        for part in parts:
-            if part[2:4] == u'<<':
-                lang = part[0:2].lower()
-                text = part[4:]
-                elements[lang] = renderElement(u'div id="html"',
-                    contents=text)
-            else:
-                text = part
-                elements[lang] = renderElement(u'div id="html"',
-                    contents=text)
-        return elements
-
     @action(_('Save'), style='primary')
     def save(self, **data):
         msave(self, **data)
-        self.context.html_dict = self._html_dict()
+        html_multilang = getattr(self.context, 'html_multilang', None)
+        portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE
+        self.context.html_dict = html2dict(html_multilang, portal_language)
         return