Changeset 7084

Timestamp:

11 Nov 2011, 14:44:23 (13 years ago)

Author:

uli

Message:

• Skip applicant data processing when image upload failed, avoiding double error messages.

• Add hint about changed images in logs.

File:

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

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

@@ -732 +732 @@
         self.wf_info = IWorkflowInfo(self.context)
         self.max_upload_size = string_from_bytes(MAX_UPLOAD_SIZE)
+        self.passport_changed = None
         upload = self.request.form.get('form.passport', None)
         if upload:
             # We got a fresh upload
-            passport_changed = handle_img_upload(upload, self.context, self)
+            self.passport_changed = handle_img_upload(
+                upload, self.context, self)
         return
 
@@ -760 +762 @@
     @grok.action('Save')
     def save(self, **data):
+        if self.passport_changed is False:  # False is not None!
+            return # error during image upload. Ignore other values
         changed_fields = self.applyData(self.context, **data)
         changed_fields = changed_fields.values()
         fields_string = '+'.join(
             ' + '.join(str(i) for i in b) for b in changed_fields)
+        if self.passport_changed:
+            fields_string += ' + passport'
         self.context._p_changed = True
         form = self.request.form
@@ -810 +816 @@
     @grok.action('Save')
     def save(self, **data):
+        if self.passport_changed is False:  # False is not None!
+            return # error during image upload. Ignore other values
         self.applyData(self.context, **data)
         self.context._p_changed = True
@@ -817 +825 @@
     @grok.action('Final Submit')
     def finalsubmit(self, **data):
+        if self.passport_changed is False:  # False is not None!
+            return # error during image upload. Ignore other values
         self.applyData(self.context, **data)
         self.context._p_changed = True