Changeset 2136

Timestamp:

21 Aug 2007, 09:02:13 (17 years ago)

Author:

joachim

Message:

check for passport picture in widget

Location:

WAeUP_SRP/trunk

Files:

• Widgets.py (modified) (4 diffs)
• skins/waeup_student/apply_pume.py (modified) (1 diff)

WAeUP_SRP/trunk/Widgets.py

@@ -1599 +1599 @@
         widget_id = self.getWidgetId()
         file_name = datamodel[self.fields[0]]
+        #import pdb; pdb.set_trace()
+        if self.allow_resize:
+            datastructure[self.getWidgetId() + '_resize'] = ''
         datastructure[widget_id] = file_name
         datastructure[widget_id + '_choice'] = 'change'
@@ -1608 +1611 @@
         """Update datamodel from user data in datastructure.
         """
-        #import pdb; pdb.set_trace()
         logger = logging.getLogger('Widgets.NoZodbImageWidget.validate')
         datamodel = datastructure.getDataModel()
@@ -1624 +1626 @@
         fileupload = datastructure[widget_id]
         is_upload = isinstance(fileupload, FileUpload)
-        if not is_upload:
-            return True
+        #import pdb; pdb.set_trace()
+        if not is_upload and not datamodel[field_id]:
+            if self.is_required:
+                return self.validateError('cpsschemas_err_required', {},
+                                          datastructure)
         if choice == 'delete':
             if self.is_required:
@@ -1662 +1667 @@
             store = True
 
-        self.otherProcessing(choice, datastructure)
 
         # Find filename
-        if is_upload:
+        if is_upload and store:
             ext ='jpg'
             filename = "%s_%s.%s" % (datastructure[self.id_field],
                                  self.getWidgetId(),
                                  ext)
+            datamodel[field_id] = filename
             registry = getToolByName(self, 'mimetypes_registry')
             mimetype = registry.lookupExtension(filename.lower())
             if mimetype is not None:
                 mimetype = str(mimetype) # normalize
-
-        if store:
             # Set/update data
-            file_path = "%s_%s.jpg" % (datamodel[self.id_field],
-                                       field_id,)
-            full_path = "%s/%s" % (self.storage_path, file_path)
+            # file_path = "%s_%s.jpg" % (datamodel[self.id_field],
+            #                            field_id,)
+            full_path = "%s/%s" % (self.storage_path, filename)
+            #import pdb; pdb.set_trace()
             file = self.makeFile(filename, fileupload, datastructure)
             # Fixup mimetype

WAeUP_SRP/trunk/skins/waeup_student/apply_pume.py

@@ -117 +117 @@
                                 commit = False,
                                 )
-    elif not dm.get('passport'):
-        mode = "edit"
-        psm = "Please upload Passport Photograph!"
-        logger.info('%s tried to submit without uploading a passport foto' % (reg_no))
+    # elif not dm.get('passport'):
+    #     mode = "edit"
+    #     psm = "Please upload Passport Photograph!"
+    #     logger.info('%s tried to submit without uploading a passport foto' % (reg_no))
     elif not request.has_key('confirm'):
         mode = "edit"