X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/2d47c9c3dc8e8265381e167514626f854a2a6f2b..fc9e46f8f27aaceecd2825cd90409451c3974159:/photo.py diff --git a/photo.py b/photo.py index e7a10a1..e66f8eb 100755 --- a/photo.py +++ b/photo.py @@ -21,9 +21,11 @@ from Products.CMFCore.permissions import View, AccessContentsInformation, \ from permissions import ViewRawImage from zope.component.factory import Factory from zope.interface import implements -from webdav.WriteLockInterface import WriteLockInterface as z2IWriteLock +#from webdav.WriteLockInterface import WriteLockInterface as z2IWriteLock +from webdav.interfaces import IWriteLock from Products.CMFCore.interfaces import IContentish -from Products.CMFCore.interfaces.Contentish import Contentish as z2IContentish +from Products.CMFCore.interfaces import IDynamicType +#from Products.CMFCore.interfaces.Contentish import Contentish as z2IContentish from Products.CMFCore.DynamicType import DynamicType from Products.CMFCore.CMFCatalogAware import CMFCatalogAware @@ -37,8 +39,8 @@ from interfaces import IPhoto class Photo(DynamicType, CMFCatalogAware, BasePhoto, DefaultDublinCoreImpl) : """ Photo CMF aware """ - implements(IPhoto, IContentish) - __implements__ = (z2IContentish, z2IWriteLock, DynamicType.__implements__) + implements(IPhoto, IContentish, IWriteLock, IDynamicType) + #__implements__ = (z2IContentish, IWriteLock, DynamicType.__implements__) meta_type = BasePhoto.meta_type manage_options = BasePhoto.manage_options @@ -48,6 +50,7 @@ class Photo(DynamicType, CMFCatalogAware, BasePhoto, DefaultDublinCoreImpl) : security.declareProtected(ViewRawImage, 'getJpegImage') def __init__(self, id, title='', file='', content_type='', precondition='', **kw) : + DefaultDublinCoreImpl.__init__(self, title=title) BasePhoto.__init__(self, id, title, file, content_type=content_type, precondition=precondition, **kw) self.id = id self.title = title