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

Timestamp:

22 Apr 2013, 10:36:25 (12 years ago)

Author:

Henrik Bettermann

Message:

Prepare browser components for file uploads in custom packages.

File:

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

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

@@ -796 +796 @@
         self.wf_info = IWorkflowInfo(self.context)
         self.max_upload_size = string_from_bytes(MAX_UPLOAD_SIZE)
-        self.passport_changed = None
+        self.files_uploaded = []
+        self.upload_success = None
         upload = self.request.form.get('form.passport', None)
         if upload:
-            # We got a fresh upload
-            self.passport_changed = handle_img_upload(
+            # We got a fresh upload, upload_success is
+            # either True or False
+            self.upload_success = handle_img_upload(
                 upload, self.context, self)
+            if self.upload_success:
+                self.files_uploaded.append('passport')
         return
 
@@ -833 +837 @@
                 self.flash( ' '.join(errors))
                 return
-        if self.passport_changed is False:  # False is not None!
-            return # error during image upload. Ignore other values
+        if self.upload_success is False:  # False is not None!
+            # Error during image upload. Ignore other values.
+            # In custom packages other file uploads might have been
+            # successful.
+            changed_fields = self.files_uploaded
+            fields_string = ' + '.join(changed_fields)
+            if fields_string:
+                self.context.writeLogMessage(self, 'saved: % s' % fields_string)
+            return 
         changed_fields = self.applyData(self.context, **data)
         # Turn list of lists into single list
@@ -841 +852 @@
         else:
             changed_fields = []
-        if self.passport_changed:
-            changed_fields.append('passport')
+        if self.upload_success:
+            changed_fields += self.files_uploaded
         if password:
             # Now we know that the form has no errors and can set password ...
@@ -973 +984 @@
     @action(_('Save'), style='primary')
     def save(self, **data):
-        if self.passport_changed is False:  # False is not None!
-            return # error during image upload. Ignore other values
+        if self.upload_success is False:  # False is not None!
+            # Error during image upload. Ignore other values.
+            # In custom packages other file uploads might have been
+            # successful.
+            changed_fields = self.files_uploaded
+            fields_string = ' + '.join(changed_fields)
+            if fields_string:
+                self.context.writeLogMessage(self, 'saved: % s' % fields_string)
+            return
         self.applyData(self.context, **data)
         self.flash('Form has been saved.')
@@ -981 +999 @@
     @submitaction(_('Final Submit'))
     def finalsubmit(self, **data):
-        if self.passport_changed is False:  # False is not None!
+        if self.upload_success is False:  # False is not None!
             return # error during image upload. Ignore other values
         if self.dataNotComplete():