X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/30ac8daa26e44d77b606eda4338c392f76245879..e459e4567cc578abd5d7e02e70a01ec9464f474d:/apps/explorer/views.py diff --git a/apps/explorer/views.py b/apps/explorer/views.py old mode 100644 new mode 100755 index 2c9b17da..a67d27ca --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -11,10 +11,14 @@ from django.core.urlresolvers import reverse from django.http import HttpResponse 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 explorer import forms from api.models import PullRequest + def ajax_login_required(view): """Similar ro @login_required, but instead of redirect, just return some JSON stuff with error.""" @@ -28,13 +32,16 @@ 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_from': gallery_form, + }, context_instance=RequestContext(request)) + # # View all files # @@ -116,3 +123,11 @@ def pull_requests(request): 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="application/xhtml+xml", + extra_context = {} )