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

Timestamp:

22 Apr 2013, 08:58:12 (11 years ago)

Author:

Henrik Bettermann

Message:

In the beginning the attr parameter was not taken into account for
Applicant context as the single passport image was the
only file we stored for applicants. Meanwhile FUTMinna requires
uploads of other documents too. Now we store passport image
files without attribute but all other documents with.

Location:

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

Files:

• applicant.py (modified) (2 diffs)
• tests/test_applicant.py (modified) (1 diff)

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

@@ -278 +278 @@
         as parent name.
 
-        The `attr` parameter is not taken into account for
-        :class:`Applicant` context as the single passport image is the
-        only file we store for applicants.
+        In the beginning the `attr` parameter was not taken into account for
+        :class:`Applicant` context as the single passport image was the
+        only file we store for applicants. Meanwhile FUTMinna requires
+        uploads of other documents too. Now we store passport image
+        files without attribute but all other documents with.
 
         """
@@ -286 +288 @@
             getattr(self.context, '__parent__', None),
             '__name__', '_default')
-        marked_filename = '__%s__%s/%s.jpg' % (
-            APPLICANT_IMAGE_STORE_NAME,
-            parent_name, self.context.applicant_id)
+        if attr is None or attr == 'passport.jpg':
+            marked_filename = '__%s__%s/%s.jpg' % (
+                APPLICANT_IMAGE_STORE_NAME,
+                parent_name, self.context.applicant_id)
+        else:
+            basename, ext = os.path.splitext(attr)
+            marked_filename = '__%s__%s/%s_%s%s' % (
+                APPLICANT_IMAGE_STORE_NAME,
+                parent_name, self.context.applicant_id, basename, ext)
         return marked_filename
 

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

@@ -144 +144 @@
         return
 
+    def test_name_chooser_applicant_nonpassport_w_container(self):
+        fake_container = grok.Container()
+        fake_container.__name__ = 'folder'
+        fake_container.code = 'folder'
+        appl = Applicant()
+        appl.applicant_id = u'folder_123456'
+        appl.__parent__ = fake_container
+        chooser = IFileStoreNameChooser(appl)
+        result = chooser.chooseName(attr='any.pdf')
+        self.assertEqual(
+            result, '__img-applicant__folder/%s_any.pdf' % appl.applicant_id)
+        return
+
     def test_name_chooser_check_name(self):
         # we can check file ids for applicants