Changeset 7086

Timestamp:

11 Nov 2011, 16:37:03 (13 years ago)

Author:

Henrik Bettermann

Message:

Increase MAX_UPLOAD_SIZE, 20 kB is more realistic.

We can import DEFAULT_PASSPORT_IMAGE_MALE directly instead of IMAGE_PATH. That means configuration is solely done in interfaces.py not in browser.py.

DEFAULT_PASSPORT_IMAGE_FEMALE is no longer used.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

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

@@ -68 +68 @@
     IApplicant, IApplicantPrincipal,IApplicantEdit, IApplicantsRoot,
     IApplicantsContainer, IApplicantsContainerAdd, application_types_vocab,
-    IMAGE_PATH, MAX_UPLOAD_SIZE,
+     DEFAULT_PASSPORT_IMAGE_MALE, MAX_UPLOAD_SIZE,
     )
 from waeup.sirp.applicants.workflow import INITIALIZED, STARTED
@@ -655 +655 @@
         img = getUtility(IExtFileStore).getFileByContext(self.context)
         if img is None:
-            img = open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg'), 'rb')
+            img = DEFAULT_PASSPORT_IMAGE_MALE
         doc_img = Image(img.name, width=4*cm, height=3*cm, kind='bound')
         story.append(doc_img)
@@ -868 +868 @@
         if image is None:
             # show placeholder image
-            return open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg'), 'rb')
+            return DEFAULT_PASSPORT_IMAGE_MALE
         return image

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

@@ -49 +49 @@
     )
 DEFAULT_PASSPORT_IMAGE_MALE = open(
-    os.path.join(IMAGE_PATH, 'placeholder_m.jpg')).read()
-DEFAULT_PASSPORT_IMAGE_FEMALE = open(
-    os.path.join(IMAGE_PATH, 'placeholder_f.jpg')).read()
+    os.path.join(IMAGE_PATH, 'placeholder_m.jpg'))
 
 #: Maximum upload size for applicant passport photographs (in bytes)
-MAX_UPLOAD_SIZE = 1024 * 10
+MAX_UPLOAD_SIZE = 1024 * 20
 
 # Define a valiation method for email addresses

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_browser.py

@@ -666 +666 @@
         self.login()
         # Create a pseudo image file and select it to be uploaded in form
-        photo_content = 'A' * 1024 * 11  # A string of 11 GB size
+        photo_content = 'A' * 1024 * 21  # A string of 11 GB size
         pseudo_image = StringIO(photo_content)
         ctrl = self.browser.getControl(name='form.passport')