Changeset 12436

Timestamp:

10 Jan 2015, 06:42:35 (10 years ago)

Author:

Henrik Bettermann

Message:

Store public documents in right place.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Files:

• document.py (modified) (1 diff)
• tests/test_document.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py

@@ -252 +252 @@
 
         For document with id 'd123'
-        with attr ``'nice_image.jpeg'`` stored in
-        the documents container this chooser would create:
-
-          ``'__file-document__documents/nice_image_d123.jpeg'``
+        with attr ``'nice_image.jpeg'`` this chooser would create:
+
+          ``'__file-document__nice_image_d123.jpeg'``
 
         meaning that the nice image of this document would be
         stored in the site-wide file storage in path:
 
-          ``documents/nice_image_d123.jpeg``
+          ``nice_image_d123.jpeg``
 
         """
         basename, ext = os.path.splitext(attr)
         doc_id = self.context.document_id
-        marked_filename = '__%s__documents/%s_%s%s' % (
+        marked_filename = '__%s__%s_%s%s' % (
             DOCUMENT_FILE_STORE_NAME,
             basename, doc_id, ext)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_document.py

@@ -165 +165 @@
         # the file would be stored in a ``_default`` directory.
         self.assertEqual(
-            result, '__file-document__documents/sample_DOC.jpg')
+            result, '__file-document__sample_DOC.jpg')
         return