[Checkins] SVN: z3c.reference/branches/flash/src/z3c/reference/ remove adapts of default settings adapter so we can use it as a base class

Bernd Dorn bernd.dorn at lovelysystems.com
Fri Sep 7 01:49:38 EDT 2007


Log message for revision 79512:
  remove adapts of default settings adapter so we can use it as a base class

Changed:
  U   z3c.reference/branches/flash/src/z3c/reference/README.txt
  U   z3c.reference/branches/flash/src/z3c/reference/browser/widget.py
  U   z3c.reference/branches/flash/src/z3c/reference/configure.zcml
  U   z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml
  U   z3c.reference/branches/flash/src/z3c/reference/reference.py

-=-
Modified: z3c.reference/branches/flash/src/z3c/reference/README.txt
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/README.txt	2007-09-07 04:58:22 UTC (rev 79511)
+++ z3c.reference/branches/flash/src/z3c/reference/README.txt	2007-09-07 05:49:38 UTC (rev 79512)
@@ -35,7 +35,7 @@
 
   >>> from zope.schema.fieldproperty import FieldProperty
   >>> from z3c.reference.schema import ViewReferenceField
-  >>> 
+  >>>
   >>> class IContent(interface.Interface):
   ...     ref = ViewReferenceField(title=u"Reference")
   >>> class Content(object):
@@ -142,19 +142,21 @@
 ViewReferenceSettings
 ---------------------
 
-Fields define a settingName, by default this name is a empty string if not 
+Fields define a settingName, by default this name is a empty string if not
 explicit given. This settingName is used for call a related named adapter
-providing IViewReferenceSettings which provides a dictionary with key, values
+providing IViewReferenceSettings which provides a dictionary with
+arbitrary information that is specific to the implementation
 under the attribute ``settings``.
 
 This settings are used for help to setup a reference editor. Let's see how
-this works. By default, we get the DefaultViewReferenceSetting adapter for a 
+this works. By default, we get the DefaultViewReferenceSetting adapter for a
 referenced object:
 
   >>> import zope.component
   >>> from z3c.reference.interfaces import IViewReferenceSettings
   >>> from z3c.reference.reference import DefaultViewReferenceSettings
-  >>> zope.component.provideAdapter(DefaultViewReferenceSettings)
+  >>> zope.component.provideAdapter(DefaultViewReferenceSettings,
+  ...                               (interface.Interface,))
 
   >>> adapter = IViewReferenceSettings(o)
   >>> adapter

Modified: z3c.reference/branches/flash/src/z3c/reference/browser/widget.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/widget.py	2007-09-07 04:58:22 UTC (rev 79511)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/widget.py	2007-09-07 05:49:38 UTC (rev 79512)
@@ -69,7 +69,7 @@
     def referenceEditorURL(self):
         """Returns the refrence explorer url."""
         return absoluteURL(self.context.context, self.request) + '/%s?%s' % (
-            self.referenceExplorerViewName, 
+            self.referenceExplorerViewName,
             urllib.urlencode({'settingName': self.context.settingName,
                              'target': self.targetValue,
                              'view': self.viewValue,
@@ -178,7 +178,7 @@
         except TypeError:
             return self._missing
         return url
-    
+
     def _toFieldValue(self, input):
         if input == self._missing:
             return self.context.missing_value
@@ -196,7 +196,7 @@
         viewName = self.name + '.view'
         titleName = self.name + '.title'
         descriptionName = self.name + '.description'
-        
+
         # get target obj str
         intid = self.request.get(targetName)
         if intid is None:
@@ -229,7 +229,7 @@
 
 
 class ObjectReferenceWidget(ViewReferenceWidget):
-    
+
     @Lazy
     def extra(self):
         iface = self.context.refSchema
@@ -255,16 +255,16 @@
     >>> w = ImageReferenceWidget(field,request)
     >>> print w()
     <input .../><img ...height="10" id="field.ref.tag" .../>
-    
+
     """
 
 
-    
+
     refTag = u'img'
     _emptyReference = emptyImageReference
     extra = u''
 
-    
+
     def __call__(self):
         hidden = super(ViewReferenceWidget,self).__call__()
         if self._renderedValueSet():
@@ -276,7 +276,7 @@
                 ref = self.context.get(self.context.context)
             except:
                 ref = None
-        if ref is None:            
+        if ref is None:
             ref = self._emptyReference
             url = absoluteURL(ref, self.request)
         else:

Modified: z3c.reference/branches/flash/src/z3c/reference/configure.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/configure.zcml	2007-09-07 04:58:22 UTC (rev 79511)
+++ z3c.reference/branches/flash/src/z3c/reference/configure.zcml	2007-09-07 05:49:38 UTC (rev 79512)
@@ -12,6 +12,7 @@
   </class>
 
   <adapter
+      for="zope.interface.Interface"
       factory=".reference.DefaultViewReferenceSettings"
       />
 

Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml	2007-09-07 04:58:22 UTC (rev 79511)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml	2007-09-07 05:49:38 UTC (rev 79512)
@@ -12,7 +12,7 @@
       name="img.jpg"
       file="swf/testimage.jpg"
       />
-    
+
   <addMenuItem
       class="..app.DemoFolder"
       permission="zope.ManageContent"
@@ -30,6 +30,8 @@
       name="edit.html"
       class=".views.DemoFolderEdit"
       permission="zope.ManageContent"
+      menu="zmi_views"
+      title="Edit"
       />
 
   <!-- test -->
@@ -46,6 +48,8 @@
       name="edit.html"
       class=".views.DemoImageEdit"
       permission="zope.ManageContent"
+      menu="zmi_views"
+      title="Edit"
       />
 
   <page

Modified: z3c.reference/branches/flash/src/z3c/reference/reference.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/reference.py	2007-09-07 04:58:22 UTC (rev 79511)
+++ z3c.reference/branches/flash/src/z3c/reference/reference.py	2007-09-07 05:49:38 UTC (rev 79512)
@@ -21,7 +21,6 @@
 import zope.interface
 import zope.component
 from zope.dublincore.property import DCProperty
-from zope.location.interfaces import ILocation
 from zope.schema.fieldproperty import FieldProperty
 from zope.annotation.interfaces import IAttributeAnnotatable
 from lovely.relation.property import (FieldRelationManager,
@@ -65,8 +64,8 @@
             return (self.view != other.view) or \
                    (self.target != other.target)
         return True
-        
 
+
 class ImageReference(ViewReference):
     zope.interface.implements(interfaces.IImageReference)
 
@@ -75,7 +74,6 @@
     """Default view reference settings adapter."""
 
     zope.interface.implements(interfaces.IViewReferenceSettings)
-    zope.component.adapts(ILocation)
 
     def __init__(self, context):
         self.context = context



More information about the Checkins mailing list