[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/ - removed schema adapter registrations (that was overkill and didn't work for all forms)

[Yvo Schubbe]

Log message for revision 130264:
  - removed schema adapter registrations (that was overkill and didn't work for all forms)
  - schema adapters are now used directly

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml	2013-07-06 08:34:57 UTC (rev 130263)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml	2013-07-06 08:36:32 UTC (rev 130264)
@@ -2,8 +2,6 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser">
 
-  <adapter factory=".event.EventSchemaAdapter"/>
-
   <include package="Products.CMFCore" file="permissions.zcml"/>
 
   <utility

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py	2013-07-06 08:34:57 UTC (rev 130263)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py	2013-07-06 08:36:32 UTC (rev 130264)
@@ -15,6 +15,7 @@
 
 import time
 
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zope.component import adapts
 from zope.component import getUtility
 from zope.formlib import form
@@ -30,14 +31,15 @@
 from zope.schema.interfaces import IVocabularyFactory
 
 from Products.CMFCore.interfaces import IMetadataTool
-from Products.CMFDefault.browser.utils import decode, ViewBase
+from Products.CMFDefault.browser.utils import decode
+from Products.CMFDefault.browser.utils import memoize
+from Products.CMFDefault.browser.utils import ViewBase
 from Products.CMFDefault.formlib.form import ContentEditFormBase
 from Products.CMFDefault.formlib.form import DisplayFormBase
 from Products.CMFDefault.formlib.schema import EmailLine
 from Products.CMFDefault.formlib.schema import ProxyFieldProperty
 from Products.CMFDefault.formlib.schema import SchemaAdapterBase
 from Products.CMFDefault.formlib.vocabulary import SimpleVocabulary
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 from Products.CMFCalendar.interfaces import IMutableEvent
 from Products.CMFCalendar.utils import Message as _
@@ -142,6 +144,10 @@
 
 class EventViewMixin(object):
 
+    @memoize
+    def getContent(self):
+        return EventSchemaAdapter(self.context)
+
     def setUpWidgets(self, ignore_request=False):
         super(EventViewMixin,
               self).setUpWidgets(ignore_request=ignore_request)