X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/0600fa257660dd107bada5971b3296b3244fea03..a1f864eeb12aacf2d2c094c2bcb8add8b10c4e48:/apps/explorer/views.py diff --git a/apps/explorer/views.py b/apps/explorer/views.py old mode 100644 new mode 100755 index b17b8c8e..71493c69 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -8,12 +8,17 @@ from django.conf import settings from django.contrib.auth.decorators import login_required, permission_required from django.core.urlresolvers import reverse -from django.http import HttpResponse +from django.http import HttpResponse, Http404 from django.utils import simplejson as json from django.views.generic.simple import direct_to_template +from django.shortcuts import render_to_response +from django.template import RequestContext from django.contrib.auth.decorators import login_required -from api.models import PullRequest +from explorer import forms, models +import os +# from api.models import PullRequest +from bookthemes.models import Theme def ajax_login_required(view): """Similar ro @login_required, but instead of redirect, @@ -28,29 +33,32 @@ def ajax_login_required(view): @login_required def display_editor(request, path): user = request.GET.get('user', request.user.username) - log.info(user) + gallery_form = forms.GalleryChoiceForm() - return direct_to_template(request, 'explorer/editor.html', extra_context={ + return render_to_response('explorer/editor.html', + # mimetype="text/html", + dictionary = { 'fileid': path, - 'euser': user - }) - + 'euser': user, + 'gallery_form': gallery_form, + 'available_themes': ({'first_letter': t.name[0].upper(), 'name': t.name} for t in Theme.objects.order_by('name')), + }, context_instance=RequestContext(request)) + # # View all files # def file_list(request): - import api.forms - from api.resources import library_resource - - bookform = api.forms.DocumentUploadForm() + from wiki.views import document_list # short-circut the api document list - doctree = library_resource.handler.read(request) + # doctree = library_resource.handler.read(request) # print "DOCTREE:", doctree['documents'] - return direct_to_template(request, 'explorer/file_list.html', extra_context={ - 'filetree': doctree['documents'], 'bookform': bookform, - }) + return document_list(request, 'explorer/file_list.html') + + # return direct_to_template(request, 'explorer/file_list.html', extra_context={ + # 'files': files, 'bookform': bookform, + # }) @permission_required('api.document.can_add') def file_upload(request): @@ -109,11 +117,28 @@ def _get_issues_for_file(fileid): # = Pull requests = # ================= def pull_requests(request): - objects = PullRequest.objects.order_by('status') + objects = PullRequest.objects.order_by('-status', 'timestamp') if not request.user.has_perm('explorer.book.can_share'): objects = objects.filter(comitter=request.user) - return direct_to_template(request, 'manager/pull_request.html', extra_context = {'objects': objects} ) + + +# +# Testing +# +def renderer_test(request): + return direct_to_template(request, 'renderer.html', mimetype="text/html", + extra_context = {} ) + + +def document_gallery(request, document): + assocs = models.GalleryForDocument.objects.filter(document=document) + directory = assocs[0].subpath + try: + images = ['/media/%s/%s' % (directory, f) for f in os.listdir(os.path.join(settings.MEDIA_ROOT, directory)) if f.lower().endswith('.jpg')] + return HttpResponse(json.dumps(images)) + except IndexError: + raise Http404