Changeset 7122

Timestamp:

16 Nov 2011, 21:31:38 (13 years ago)

Author:

Henrik Bettermann

Message:

Let applicants cooperate with new imagestorage. Fix tests.

Extend permissions for PortalManager?.

Location:

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

Files:

• permissions.py (modified) (1 diff)
• students/student.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/permissions.py

@@ -69 +69 @@
                      'waeup.managePortalConfiguration',
                      'waeup.manageApplications', 'waeup.handleApplication',
-                     'waeup.viewStudents', 'waeup.manageStudents')
+                     'waeup.viewStudent', 'waeup.manageStudents',
+                     'waeup.viewHostels', 'waeup.manageHostels')
 
 def getRoles():

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

@@ -223 +223 @@
         """
         marker, filename, basename, ext = store.extractMarker(file_id)
-        return os.path.join(root, 'students', filename)
+        sub_root = os.path.join(root, 'students')
+        return super(StudentFileStoreHandler, self).pathFromFileID(
+            store, sub_root, basename)
 
     def createFile(self, store, root, filename, file_id, file):
         """Create a browsable file-like object.
         """
-        # possible other actions: check for jpeg format
-        path = self.pathFromFileID(store, root, file_id)
-        return file, path, WAeUPImageFile(filename, file_id)
+        ext = os.path.splitext(filename)[1].lower()
+        if ext not in ['.jpg', '.png']:
+            raise ValueError('Only .jpg and .png allowed')
+        # call super method to ensure that any old files with
+        # different filename extension are deleted.
+        file, path, file_obj =  super(
+            StudentFileStoreHandler, self).createFile(
+            store, root,  filename, file_id, file)
+        return file, path, WAeUPImageFile(
+            file_obj.filename, file_obj.data)

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

@@ -372 +372 @@
         self.browser.open(self.edit_clearance_student_path)
         pseudo_image = StringIO('I pretend to be a graphics file')
-        ctrl = self.browser.getControl(name='birth_certificate')
+        ctrl = self.browser.getControl(name='birthcertificateuploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my_birth_certificate.jpg')
@@ -382 +382 @@
         # ... but the correct upload submit button does
         pseudo_image = StringIO('I pretend to be a graphics file')
-        ctrl = self.browser.getControl(name='birth_certificate')
+        ctrl = self.browser.getControl(name='birthcertificateuploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my_birth_certificate.jpg')
-        self.browser.getControl(name='upload_birth_certificate').click()
+        self.browser.getControl(
+            name='upload_birthcertificateuploadmanage').click()
         # There is a correct <img> link included
         self.assertTrue(
             '<a target="image" href="birth_certificate.jpg">'
             in self.browser.contents)
+
         # Browsing the link shows a real image
         self.browser.open('birth_certificate.jpg')
@@ -399 +401 @@
         photo_content = 'A' * 1024 * 151  # A string of 21 KB size
         pseudo_image = StringIO(photo_content)
-        ctrl = self.browser.getControl(name='birth_certificate')
+        ctrl = self.browser.getControl(name='birthcertificateuploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my_birth_certificate.jpg')
-        self.browser.getControl(name='upload_birth_certificate').click()
+        self.browser.getControl(
+            name='upload_birthcertificateuploadmanage').click()
         self.assertTrue(
             'Uploaded file is too big' in self.browser.contents)
         # File names must meet several conditions
         pseudo_image = StringIO('I pretend to be a graphics file')
-        ctrl = self.browser.getControl(name='birth_certificate')
+        ctrl = self.browser.getControl(name='birthcertificateuploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my.photo.jpg')
-        self.browser.getControl(name='upload_birth_certificate').click()
+        self.browser.getControl(
+            name='upload_birthcertificateuploadmanage').click()
         self.assertTrue('File name contains more than one dot'
             in self.browser.contents)
-        ctrl = self.browser.getControl(name='birth_certificate')
+        ctrl = self.browser.getControl(name='birthcertificateuploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my_birth_certificate')
-        self.browser.getControl(name='upload_birth_certificate').click()
+        self.browser.getControl(
+            name='upload_birthcertificateuploadmanage').click()
         self.assertTrue('File name has no extension' in self.browser.contents)
-        ctrl = self.browser.getControl(name='birth_certificate')
+        ctrl = self.browser.getControl(name='birthcertificateuploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my_birth_certificate.bmp')
-        self.browser.getControl(name='upload_birth_certificate').click()
+        self.browser.getControl(
+            name='upload_birthcertificateuploadmanage').click()
         self.assertTrue('.jpg file extension expected' in self.browser.contents)
         # Managers can delete files
-        self.browser.getControl(name='delete_birth_certificate').click()
+        self.browser.getControl(name='delete_birthcertificateuploadmanage').click()
         self.assertTrue(
             'File birth_certificate.jpg deleted'
@@ -431 +437 @@
         self.browser.open(self.edit_clearance_student_path)
         pseudo_image = StringIO('I pretend to be a graphics file')
-        ctrl = self.browser.getControl(name='birth_certificate')
+        ctrl = self.browser.getControl(name='birthcertificateuploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my_acceptance_letter.jpg')
-        self.browser.getControl(name='upload_acceptance_letter').click()
+        self.browser.getControl(
+            name='upload_acceptanceletteruploadmanage').click()
         self.assertFalse(
             '<a target="image" href="acceptance_letter.jpg">'
             in self.browser.contents)
-        ctrl = self.browser.getControl(name='acceptance_letter')
+        ctrl = self.browser.getControl(name='acceptanceletteruploadmanage')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='my_acceptance_letter.jpg')
-        self.browser.getControl(name='upload_acceptance_letter').click()
+        self.browser.getControl(
+            name='upload_acceptanceletteruploadmanage').click()
         self.assertTrue(
             '<a target="image" href="acceptance_letter.jpg">'
             in self.browser.contents)
-        self.browser.getControl(name='delete_acceptance_letter').click()
+        self.browser.getControl(
+            name='delete_acceptanceletteruploadmanage').click()
         self.assertTrue(
             'File acceptance_letter.jpg deleted'