X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/8705c980a8a35af6c4fc6e309f389bc1aae0b6d7..061f517181630ee982c33aee63965b18965fd5aa:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 46cdd4ee..a67d27ca 100755 --- 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 # @@ -122,5 +129,5 @@ def pull_requests(request): # Testing # def renderer_test(request): - return direct_to_template(request, 'renderer.html', mimetype="text/html", - extra_context = {} ) \ No newline at end of file + return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml", + extra_context = {} )