From: zuber Date: Thu, 20 Aug 2009 10:15:19 +0000 (+0200) Subject: Sortowanie listy plików i folderów w get_image_folders i get_images_from_folder.... X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/33d3159145359df7638b3ac0268d4a400856a932?ds=sidebyside;hp=-c Sortowanie listy plików i folderów w get_image_folders i get_images_from_folder. Refs #56. --- 33d3159145359df7638b3ac0268d4a400856a932 diff --git a/apps/explorer/models.py b/apps/explorer/models.py index 5fa93ad6..1f8e93dc 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -4,11 +4,11 @@ from django.conf import settings def get_image_folders(): - return [fn for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR)) if not fn.startswith('.')] + return sorted(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): - return [settings.MEDIA_URL + settings.IMAGE_DIR + '/' + folder + '/' + fn for fn + return sorted(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('.'))