Changeset 10095

Timestamp:

23 Apr 2013, 09:39:09 (12 years ago)

Author:

Henrik Bettermann

Message:

Simplify logging. files_uploaded attribute is redundant.

Location:

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

Files:

• browser.py (modified) (5 diffs)
• tests/test_browser.py (modified) (1 diff)

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.files_uploaded = []
         self.upload_success = None
         upload = self.request.form.get('form.passport', None)
@@ -805 +804 @@
                 upload, self.context, self)
             if self.upload_success:
-                self.files_uploaded.append('passport')
+                self.context.writeLogMessage(self, 'saved: passport')
         return
 
@@ -839 +838 @@
         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)
@@ -852 +845 @@
         else:
             changed_fields = []
-        if self.upload_success:
-            changed_fields += self.files_uploaded
         if password:
             # Now we know that the form has no errors and can set password ...
@@ -995 +986 @@
         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)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -708 +708 @@
         self.assertTrue(passport1 == passport2)
         return
+
+    def test_upload_image_by_manager_with_logging(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.manage_path)
+        # Create a pseudo image file and select it to be uploaded in form
+        photo_content = 'A' * 1024 * 5  # A string of 5 KB size
+        pseudo_image = StringIO(photo_content)
+        ctrl = self.browser.getControl(name='form.passport')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(pseudo_image, filename='myphoto.jpg')
+        self.browser.getControl("Save").click() # submit form
+        # Even though the form could not be saved ...
+        self.assertTrue(
+            'Required input is missing' in self.browser.contents)
+        # ... the file has been successfully uploaded
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'applicants.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            'zope.mgr - applicants.browser.ApplicantManageFormPage - '
+            '%s - saved: passport'
+            % (self.applicant.applicant_id)
+            in logcontent)
 
     def test_pay_application_fee(self):