Merge branch 'master' of git@stigma:platforma

[redakcja.git] / apps / explorer / models.py

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 3b5848b..5fa93ad 100644 (file)
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -4,11 +4,11 @@ from django.conf import settings
 
 
 def get_image_folders():
 
 
 def get_image_folders():

-    return [fn for fn in os.listdir(settings.IMAGE_DIR) if not fn.startswith('.')]
+    return [fn for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR)) if not fn.startswith('.')]

 
 
 def get_images_from_folder(folder):
 
 
 def get_images_from_folder(folder):

-    return ['/media/images/' + folder + '/' + fn for fn 
-            in os.listdir(os.path.join(settings.IMAGE_DIR, folder))
+    return [settings.MEDIA_URL + settings.IMAGE_DIR + '/' + folder + '/' + fn for fn 
+            in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))

             if not fn.startswith('.')]
 
             if not fn.startswith('.')]