Changeset 7063 for main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

Timestamp:

9 Nov 2011, 15:42:45 (13 years ago)

Author:

uli

Message:

Merge changes from branch ulif-extimgstore back into trunk.
Beside external image storage also waeupdocs should work again.

Location:

main/waeup.sirp/trunk

Files:

• . (modified) (1 prop)
• src/waeup/sirp/applicants/interfaces.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

@@ -29 +29 @@
 
 from zope import schema
-from zope.interface import Interface, Attribute, provider
+from zope.interface import Interface, Attribute
 from zope.component import getUtilitiesFor
 from zope.pluggableauth.interfaces import IPrincipalInfo
 from zope.security.interfaces import IGroupClosureAwarePrincipal as IPrincipal
 from zc.sourcefactory.basic import BasicSourceFactory
-from waeup.sirp.image import createWAeUPImageFile
-from waeup.sirp.image.schema import ImageFile
 from waeup.sirp.interfaces import IWAeUPObject, year_range
 from waeup.sirp.university.vocabularies import application_categories
@@ -66 +64 @@
     return True
 
-@provider(schema.interfaces.IContextAwareDefaultFactory)
-def default_passport_image(context):
-    """A default value factory for ImageFile fields.
-
-    Returns some default image as WAeUPImageFile. We cannot set the
-    default directly in ImageFile fields, as, if we want to set
-    max_size or min_size as well, some utility lookups are needed
-    which are not possible during startup.
-
-    Developers which use IContextAwareDefaultFactories like this one
-    always should make sure that the delivered default meets all
-    constraints of the field that makes use of this default value
-    provider.
-    """
-    imagefile = createWAeUPImageFile(
-        'placeholder_m.jpg',
-        open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg'), 'r')
-        )
-    return imagefile
-
 class ApplicantContainerProviderSource(BasicSourceFactory):
     """A source offering all available applicants container types.
@@ -370 +348 @@
         required = False,
         )
-    passport = ImageFile(
-        title = u'Passport Photograph',
-        #default = DEFAULT_PASSPORT_IMAGE_MALE,
-        defaultFactory = default_passport_image,
-        description = u'Maximun file size is 20 kB.',
-        required = True,
-        max_size = 20480,
-        )
+    #passport = ImageFile(
+    #    title = u'Passport Photograph',
+    #    #default = DEFAULT_PASSPORT_IMAGE_MALE,
+    #    defaultFactory = default_passport_image,
+    #    description = u'Maximun file size is 20 kB.',
+    #    required = True,
+    #    max_size = 20480,
+    #    )
 
     #