Changeset 15833 for main/waeup.kofa/trunk/src/waeup

Timestamp:

21 Nov 2019, 06:43:08 (5 years ago)

Author:

Henrik Bettermann

Message:

Make max passport picture size customizable.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (3 diffs)
• applicants/interfaces.py (modified) (1 diff)
• students/fileviewlets.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -38 +38 @@
     IApplicant, IApplicantEdit, IApplicantsRoot,
     IApplicantsContainer, IApplicantsContainerAdd,
-    MAX_UPLOAD_SIZE, IApplicantOnlinePayment, IApplicantsUtils,
+    IApplicantOnlinePayment, IApplicantsUtils,
     IApplicantRegisterUpdate, ISpecialApplicant,
     IApplicantRefereeReport
@@ -919 +919 @@
     points to end of file when leaving this function.
     """
+    max_upload_size = getUtility(IKofaUtils).MAX_PASSPORT_SIZE
     size = file_size(upload)
-    if size > MAX_UPLOAD_SIZE:
+    if size > max_upload_size:
         view.flash(_('Uploaded image is too big!'), type='danger')
         return False
@@ -989 +990 @@
     def update(self):
         super(ApplicantManageFormPage, self).update()
+        max_upload_size = getUtility(IKofaUtils).MAX_PASSPORT_SIZE
         self.wf_info = IWorkflowInfo(self.context)
-        self.max_upload_size = string_from_bytes(MAX_UPLOAD_SIZE)
+        self.max_upload_size = string_from_bytes(max_upload_size)
         self.upload_success = None
         upload = self.request.form.get('form.passport', None)

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

@@ -40 +40 @@
     AppCatSource, CertificateSource, SpecialApplicationSource)
 
-#: Maximum upload size for applicant passport photographs (in bytes)
-MAX_UPLOAD_SIZE = 1024 * 50
-
 _marker = object() # a marker different from None
 

main/waeup.kofa/trunk/src/waeup/kofa/students/fileviewlets.py

@@ -22 +22 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.interfaces import (
-    IExtFileStore, IFileStoreNameChooser, IKofaObject)
+    IExtFileStore, IFileStoreNameChooser, IKofaObject, IKofaUtils)
 from waeup.kofa.utils.helpers import string_from_bytes, file_size
 from waeup.kofa.browser import DEFAULT_IMAGE_PATH
@@ -107 +107 @@
     grok.template('imageupload')
     label = _(u'Passport Picture (jpg only)')
-    mus = 1024 * 50
     download_name = u'passport.jpg'
     tab_redirect = '#tab2'
+
+    @property
+    def mus(self):
+        kofa_utils = getUtility(IKofaUtils)
+        return kofa_utils.MAX_PASSPORT_SIZE
 
 

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -239 +239 @@
     MAX_FILES = 100
 
+    #: Maximum size in Bytes of passport images in the applicants and
+    #: students section
+    MAX_PASSPORT_SIZE = 50 * 1024
+
     #: Temporary passwords and parents password validity period
     TEMP_PASSWORD_MINUTES = 10