Changeset 12229

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.

Location:

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

Files:

• browser/layout.py (modified) (1 diff)
• browser/pages.py (modified) (4 diffs)
• documents/browser.py (modified) (2 diffs)
• utils/helpers.py (modified) (2 diffs)
• widgets/htmlwidget.py (deleted)

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

@@ -201 +201 @@
             if 'address' in widget.name or \
                 'comment' in widget.name or \
+                'description' in widget.name or \
                 'notice' in widget.name:
-                widget.height = 6
-        if self.widgets.get('transcript_comment'):
-            self.widgets['transcript_comment'].height = 12
-        if self.widgets.get('jamb_subjects'):
-            self.widgets['jamb_subjects'].height = 6
+                widget.height = 3
 
 class IkobaAddFormPage(UtilityView,AddForm):

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

@@ -42 +42 @@
 from zope.session.interfaces import ISession
 from zope.password.interfaces import IPasswordManager
+from waeup.ikoba.utils.helpers import html2dict
 from waeup.ikoba.browser.layout import (
     IkobaPage, IkobaForm, IkobaEditFormPage, IkobaAddFormPage,
@@ -60 +61 @@
 
 from waeup.ikoba.authentication import LocalRoleSetEvent
-from waeup.ikoba.widgets.htmlwidget import HTMLDisplayWidget
 from waeup.ikoba.utils.helpers import get_user_account, check_csv_charset
 from waeup.ikoba.mandates.mandate import PasswordMandate
@@ -723 +723 @@
 #
 
-class ConfigurationContainerDisplayFormPage(IkobaDisplayFormPage):
-    """View page of the configuration container.
-    """
-    grok.require('waeup.managePortalConfiguration')
-    grok.name('view')
-    grok.context(IConfigurationContainer)
-    pnav = 0
-    label = _(u'View portal configuration')
-    form_fields = grok.AutoFields(IConfigurationContainer)
-    form_fields['frontpage'].custom_widget = HTMLDisplayWidget
-
-
 class ConfigurationContainerManageFormPage(IkobaEditFormPage):
     """Manage page of the configuration container. We always use the
@@ -747 +735 @@
         'frontpage_dict')
 
-    def _frontpage(self):
-        view = ConfigurationContainerDisplayFormPage(
-            self.context,self.request)
-        view.setUpWidgets()
-        return view.widgets['frontpage']()
-
     @action(_('Save'), style='primary')
     def save(self, **data):
         msave(self, **data)
-        self.context.frontpage_dict = self._frontpage()
+        frontpage = getattr(self.context, 'frontpage', None)
+        portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE
+        self.context.frontpage_dict = html2dict(frontpage, portal_language)
         return
 

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
 

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

@@ -39 +39 @@
 from zope.security.management import getInteraction
 from zope.pluggableauth.interfaces import IAuthenticatorPlugin
+from zope.formlib.widget import renderElement
 
 BUFSIZE = 8 * 1024
@@ -804 +805 @@
         result[key] = value
     return result
+
+
+def html2dict(value=None,portal_language='en'):
+    """Transforms a localized HTML text string into a dictionary.
+
+    Different languages must be separated by `>>xy<<` whereas
+    xy is the language code. Text parts without correct leading
+    language separator - usually the first part has no language
+    descriptor - are interpreted as texts in the portal's language.
+    The latter can be configured in waeup.srp.utils.utils.IkobaUtils.
+    """
+    try:
+        parts = value.split('>>')
+    except:
+        return {}
+    elements = {}
+    lang = 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