From: zuber Date: Thu, 7 Jan 2010 13:53:48 +0000 (+0100) Subject: Poprawienie URLi w galerii. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/2422dc2dcc6f61e6c7e905862bd670eb11939050?ds=sidebyside Poprawienie URLi w galerii. --- diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 71493c69..72fbf66d 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 f.lower().endswith('.jpg')] return HttpResponse(json.dumps(images)) - except IndexError: + except (IndexError, OSError), e: raise Http404 diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js index c88f2930..0928bf8d 100644 --- a/platforma/static/js/main.js +++ b/platforma/static/js/main.js @@ -94,7 +94,7 @@ function gallery(element, url) { zoom(); }); $('.change-gallery', element).click(function() { - $('.chosen-gallery').val($('#document-meta .gallery').html() || STATIC_URL + 'gallery/'); + $('.chosen-gallery').val($('#document-meta .gallery').html() || '/platforma/gallery/'); $('.gallery-image').animate({top: 53}, 200); $('.chosen-gallery').focus(); }); diff --git a/platforma/urls.py b/platforma/urls.py index a5667bb7..8100a182 100755 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -32,7 +32,7 @@ urlpatterns = patterns('', # Our über-restful api # url(r'^api/', include('api.urls')), - url(r'^gallery/(?P[^/]+)$', 'explorer.views.document_gallery'), + url(r'^gallery/(?P[^/]+)$', 'explorer.views.document_gallery'), # Static files (should be served by Apache) url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',