Changeset 10092

Timestamp:

22 Apr 2013, 15:15:19 (12 years ago)

Author:

Henrik Bettermann

Message:

Basename must come first.

Location:

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

Files:

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

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

@@ -296 +296 @@
             marked_filename = '__%s__%s/%s_%s%s' % (
                 APPLICANT_IMAGE_STORE_NAME,
-                parent_name, self.context.applicant_id, basename, ext)
+                parent_name, basename, self.context.applicant_id, ext)
         return marked_filename
 

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

@@ -152 +152 @@
         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)
+        result = chooser.chooseName(attr='anything.pdf')
+        self.assertEqual(
+            result, '__img-applicant__folder/anything_%s.pdf' % appl.applicant_id)
         return