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

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/browser

Files:

• layout.py (modified) (1 diff)
• pages.py (modified) (4 diffs)

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