Changeset 7108

Timestamp:

14 Nov 2011, 10:01:17 (13 years ago)

Author:

Henrik Bettermann

Message:

Reorganize file upload. Each viewlet gets an upload and a delete button and writes its own log message. Thus there is one line per file deletion or file upload in the log file. The save action does no longer upload the files.

It works perfectly in the UI but I have still some problems with the browser test.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (3 diffs)
• browser_templates/fileupload.pt (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• viewlets.py (modified) (7 diffs)

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

@@ -70 +70 @@
         changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
     fields_string = ' + '.join(changed_fields)
-    view.context._p_changed = True
+    #view.context._p_changed = True
     view.flash('Form has been saved.')
     if fields_string:
-        write_log_message(view, 'saved: % s' % fields_string)
+        write_log_message(view, 'saved: %s' % fields_string)
     return
 
@@ -470 +470 @@
     title = 'Clearance Data'
     pnav = 4
-    files_changed = []
-    files_deleted = []
 
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
@@ -479 +477 @@
         return super(StudentClearanceManageFormPage, self).update()
 
-    @grok.action('Save')
+    @grok.action('Save (no upload)')
     def save(self, **data):
         msave(self, **data)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/fileupload.pt

@@ -8 +8 @@
     <span class="widget">
       <tal:file tal:condition="viewlet/file_exists">
-        <input type="submit" id="delete"
-               name="delete" value="Delete file" class="button" />
         <a tal:attributes="href viewlet/download_name"
            tal:content="viewlet/download_name"
@@ -15 +13 @@
           LINK
         </a>
+        <input type="submit" id="delete"
+               name="delete" value="Delete" class="button" />
         <br /><br />
       </tal:file>
-      Upload new file:<br />
       <input type="file" tal:attributes="name viewlet/input_name"/>
+      <input type="submit" id="upload"
+             name="upload" value="Upload" class="button" />
       <br />
       <span i18n:translate="">

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -365 +365 @@
         # as birth certificate
         pseudo_image = StringIO('I pretend to be a graphics file')
-        ctrl = self.browser.getControl(name='form.birth_certificate')
+        ctrl = self.browser.getControl(name='birth_certificate')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='myphoto.jpg')
-        self.browser.getControl("Save").click() # submit form
-        # Form has errors ...
-        self.assertTrue(
-            'Required input is missing' in self.browser.contents)
-        # ... but file has been uploaded and a correct <img> link included
-        self.assertTrue(
+        # The Save action does not upload files
+        self.browser.getControl("Save (no upload)").click() # submit form
+        self.assertFalse(
             '<a target="image" href="birth_certificate.jpg">' in self.browser.contents)
+        # ... but the Upload submit button
+        import pdb; pdb.set_trace()
+        ctrl = self.browser.getControl(name='birth_certificate')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(pseudo_image, filename='myphoto.jpg')
+        self.browser.getControl("Upload").click() # submit form
         # There is a correct <img> link included
         self.assertTrue(
@@ -388 +391 @@
         photo_content = 'A' * 1024 * 151  # A string of 21 KB size
         pseudo_image = StringIO(photo_content)
-        ctrl = self.browser.getControl(name='form.birth_certificate')
+        ctrl = self.browser.getControl(name='birth_certificate')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='myphoto.jpg')

main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py

@@ -8 +8 @@
 from waeup.sirp.browser import DEFAULT_IMAGE_PATH
 from waeup.sirp.students.browser import (
-    StudentClearanceDisplayFormPage, StudentClearanceManageFormPage)
+    StudentClearanceDisplayFormPage, StudentClearanceManageFormPage,
+    write_log_message)
 from waeup.sirp.students.interfaces import IStudentClearance
 
@@ -205 +206 @@
     store = getUtility(IExtFileStore)
     store.deleteFileByContext(context, attr=download_name)
+    write_log_message(view, 'deleted: %s' % download_name)
     view.flash('File %s deleted.' % download_name)
     return
@@ -227 +229 @@
     ext.lower()
     if ext != expected_ext:
-        view.flash('%s extension expected.' % expected_ext)
+        view.flash('%s file extension expected.' % expected_ext)
         return False
     size = file_size(upload)
@@ -237 +239 @@
     file_id = IFileStoreNameChooser(context).chooseName(attr=download_name)
     store.createFile(file_id, upload)
+    write_log_message(view, 'uploaded: %s (%s)' % (download_name,upload.filename))
+    view.flash('File %s uploaded.' % download_name)
     return True
 
@@ -276 +280 @@
     grok.require('waeup.manageStudents')
     mus = 1024 * 150
-    input_name = u'form.filename'
+    input_name = u'filename'
 
     def update(self):
         self.max_upload_size = string_from_bytes(self.mus)
-        delete = self.request.form.get('delete', None)
-        if delete:
-            self.view.files_deleted += self.download_name
+        delete_button = self.request.form.get('delete', None)
+        if delete_button:
             handle_file_delete(
                 context=self.context, view=self.view,
@@ -289 +292 @@
                 self.view.url(self.context, self.view.__name__))
             return
-        upload = self.request.form.get(self.input_name, None)
-        if upload:
-            # We got a fresh upload
-            file_changed = handle_file_upload(
-                upload, self.context, self.view, self.mus, self.download_name)
-            if file_changed is False:  # False is not None!
-                self.view.redirect(
-                    self.view.url(self.context, self.view.__name__))
-                return # error during file upload. Ignore other values
-            else:
-                self.view.files_changed += self.download_name
+        upload_button = self.request.form.get('upload', None)
+        if upload_button:
+            upload = self.request.form.get(self.input_name, None)
+            if upload:
+                # We got a fresh upload
+                file_changed = handle_file_upload(
+                    upload, self.context, self.view, self.mus, self.download_name)
+                if file_changed is False:  # False is not None!
+                    self.view.redirect(
+                        self.view.url(self.context, self.view.__name__))
+                    return # error during file upload. Ignore other values
         return
 
@@ -313 +316 @@
     """
     grok.order(1)
-    label = u'Birth Certificate (jpeg image):'
+    label = u'Birth Certificate (jpg only):'
     mus = 1024 * 150
     download_name = u'birth_certificate.jpg'
-    input_name = u'form.birth_certificate'
+    input_name = u'birth_certificate'
 
 class Image(grok.View):