Use text/plain for raw.

This commit is contained in:
Julien Palard 2018-05-07 23:15:23 +02:00
parent 40e3339f19
commit df539936bd
3 changed files with 7 additions and 8 deletions

View File

@ -1,4 +1,5 @@
from django.template import RequestContext from django.template import RequestContext
from django.http import HttpResponse
from django.template import loader from django.template import loader
from pygments import highlight from pygments import highlight
from pygments.lexers import get_lexer_by_name from pygments.lexers import get_lexer_by_name
@ -18,16 +19,17 @@ def render_pygments(request, paste, data):
cache_store(key, highlighted_content) cache_store(key, highlighted_content)
data['paste'] = paste data['paste'] = paste
data['highlighted'] = highlighted_content data['highlighted'] = highlighted_content
return loader.render_to_string('paste/show-pygments.html', data, request) rendered = loader.render_to_string('paste/show-pygments.html', data, request)
return HttpResponse(rendered)
def render_form(request, paste, data): def render_form(request, paste, data):
"""Renders Form template.""" """Renders Form template."""
data['paste'] = paste data['paste'] = paste
return loader.render_to_string('paste/show-form.html', data, request) rendered = loader.render_to_string('paste/show-form.html', data, request)
return HttpResponse(rendered)
def render_raw(request, paste, data): def render_raw(request, paste, data):
"""Renders RAW content.""" """Renders RAW content."""
data['paste'] = paste return HttpResponse(paste.content, content_type='text/plain')
return loader.render_to_string('paste/show-raw.html', data, request)

View File

@ -1 +0,0 @@
{{ paste.content }}

View File

@ -1,5 +1,4 @@
from . import renderers from . import renderers
from django.http import HttpResponse
from django.urls import reverse from django.urls import reverse
from django.shortcuts import redirect, render, get_object_or_404 from django.shortcuts import redirect, render, get_object_or_404
from .models import Paste from .models import Paste
@ -53,10 +52,9 @@ def show(request, slug, renderer='pygments'):
data['current_renderer'] = renderer data['current_renderer'] = renderer
data['renderers'] = settings.PASTE['enabled_renderers'] data['renderers'] = settings.PASTE['enabled_renderers']
render_method = getattr(renderers, 'render_%s' % renderer) render_method = getattr(renderers, 'render_%s' % renderer)
rendered_template = render_method(request, paste, data) response = render_method(request, paste, data)
# Responding # Responding
response = HttpResponse(rendered_template)
if 'password' in request.POST: if 'password' in request.POST:
response.set_cookie('password', request.POST['password']) response.set_cookie('password', request.POST['password'])
return response return response