Changeset 12232 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

14 Dec 2014, 21:41:02 (10 years ago)

Author:

Henrik Bettermann

Message:

Catch

AttributeError?: 'list' object has no attribute 'keys'

if department don't have courses (like on pcn-demo portal).

File:

• main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py (modified) (4 diffs)

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

@@ -42 +42 @@
 from zope.session.interfaces import ISession
 from zope.password.interfaces import IPasswordManager
+from waeup.kofa.utils.helpers import html2dict
 from waeup.kofa.browser.layout import (
     KofaPage, KofaForm, KofaEditFormPage, KofaAddFormPage,
@@ -66 +67 @@
 from waeup.kofa.university.vocabularies import course_levels
 from waeup.kofa.authentication import LocalRoleSetEvent
-from waeup.kofa.widgets.htmlwidget import HTMLDisplayWidget
 from waeup.kofa.utils.helpers import get_user_account, check_csv_charset
 from waeup.kofa.mandates.mandate import PasswordMandate
@@ -765 +765 @@
 #
 
-class ConfigurationContainerDisplayFormPage(KofaDisplayFormPage):
-    """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(KofaEditFormPage):
     """Manage page of the configuration container. We always use the
@@ -794 +782 @@
         '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(IKofaUtils).PORTAL_LANGUAGE
+        self.context.frontpage_dict = html2dict(frontpage, portal_language)
         return