Changeset 7081

Timestamp:

11 Nov 2011, 10:04:00 (13 years ago)

Author:

uli

Message:

Tune handle_img_upload: we check file size now and emit a flash
message when there is a problem with it. More tests could happen here,
for instance for file type, etc.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py (modified) (5 diffs)

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

@@ -58 +58 @@
 from waeup.sirp.permissions import get_users_with_local_roles
 from waeup.sirp.university.interfaces import ICertificate
+from waeup.sirp.utils.helpers import string_from_bytes, file_size
 from waeup.sirp.widgets.datewidget import (
     FriendlyDateWidget, FriendlyDateDisplayWidget)
@@ -67 +68 @@
     IApplicant, IApplicantPrincipal,IApplicantEdit, IApplicantsRoot,
     IApplicantsContainer, IApplicantsContainerAdd, application_types_vocab,
-    IMAGE_PATH,
+    IMAGE_PATH, MAX_UPLOAD_SIZE,
     )
 from waeup.sirp.applicants.workflow import INITIALIZED, STARTED
@@ -695 +696 @@
     target = 'edit_full'
 
-def handle_img_upload(upload, context):
+
+def handle_img_upload(upload, context, view):
     """Handle upload of applicant image.
-    """
+
+    Returns `True` in case of success or `False`.
+
+    Please note that file pointer passed in (`upload`) most probably
+    points to end of file when leaving this function.
+    """
+    size = file_size(upload)
+    if size > MAX_UPLOAD_SIZE:
+        view.flash('Uploaded image is too big!')
+        return False
+    upload.seek(0) # file pointer moved when determining size
     store = getUtility(IExtFileStore)
     file_id = IFileStoreNameChooser(context).chooseName()
     store.createFile(file_id, upload)
-    upload.seek(0) # XXX: really neccessary?
-    return
+    return True
 
 class EditApplicantFull(WAeUPEditFormPage):
@@ -720 +731 @@
         super(EditApplicantFull, self).update()
         self.wf_info = IWorkflowInfo(self.context)
+        self.max_upload_size = string_from_bytes(MAX_UPLOAD_SIZE)
         upload = self.request.form.get('form.passport', None)
         if upload:
             # We got a fresh upload
-            handle_img_upload(upload, self.context)
-            self.passport_changed = True
+            passport_changed = handle_img_upload(upload, self.context, self)
         return
 
@@ -789 +800 @@
             return
         datepicker.need() # Enable jQuery datepicker in date fields.
-        upload = self.request.form.get('form.passport', None)
-        if upload:
-            # We got a fresh upload
-            handle_img_upload(upload, self.context)
-            self.passport_changed = True
         super(EditApplicantStudent, self).update()
         return