X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a1f864eeb12aacf2d2c094c2bcb8add8b10c4e48..465f9d370fb3b96b4cc30e139d24e4479a9f7ab0:/apps/explorer/views.py diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 71493c69..c1ada7a5 100755 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -134,11 +134,11 @@ def renderer_test(request): extra_context = {} ) -def document_gallery(request, document): - assocs = models.GalleryForDocument.objects.filter(document=document) - directory = assocs[0].subpath +def document_gallery(request, directory): try: - images = ['/media/%s/%s' % (directory, f) for f in os.listdir(os.path.join(settings.MEDIA_ROOT, directory)) if f.lower().endswith('.jpg')] + base_dir = os.path.join(settings.MEDIA_ROOT, settings.FILEBROWSER_DIRECTORY, directory) + print base_dir + images = ['%s%s%s/%s' % (settings.MEDIA_URL, settings.FILEBROWSER_DIRECTORY, directory, f) for f in os.listdir(base_dir) if os.path.splitext(f)[1].lower() in ('.jpg', '.jpeg', '.png')] return HttpResponse(json.dumps(images)) - except IndexError: + except (IndexError, OSError), e: raise Http404