Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 08:02:54 +11:00
Code Issues Projects Releases Packages Wiki Activity

Moved template variables into a context processor. Fixed content type handling with Django 1.10.

Browse source
This commit is contained in:
Martin Mahner 2016-09-06 15:07:54 +02:00
parent 722971e854
commit 6505f07a2a
3 changed files with 15 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dpaste/context_processors.py Normal file
View file

@ -0,0 +1,8 @@
from django.conf import settings
def dpaste_globals(request):
return {
'site_name': getattr(settings, 'DPASTE_SITE_NAME', 'dpaste.de'),
'jquery_url': getattr(settings, 'DPASTE_JQUERY_URL',
'https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.js'),
}

1
dpaste/settings/base.py
View file

@ -105,6 +105,7 @@ TEMPLATES = [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.template.context_processors.i18n',
'dpaste.context_processors.dpaste_globals',
],
},
},

39
dpaste/views.py
View file

@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse
from django.db.models import Count
from django.http import (Http404, HttpResponse, HttpResponseBadRequest,
HttpResponseRedirect)
from django.shortcuts import get_object_or_404, render_to_response
from django.shortcuts import get_object_or_404, render
from django.template.context import RequestContext
from django.utils.translation import ugettext_lazy as _
from django.views.decorators.csrf import csrf_exempt
@ -23,12 +23,6 @@ from .highlight import (LEXER_DEFAULT, LEXER_KEYS, LEXER_LIST,
LEXER_WORDWRAP, PLAIN_CODE)
from .models import ONETIME_LIMIT, Snippet
template_globals = {
'site_name': getattr(settings, 'DPASTE_SITE_NAME', 'dpaste.de'),
'jquery_url': getattr(settings, 'DPASTE_JQUERY_URL',
'https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.js'),
}
# -----------------------------------------------------------------------------
# Snippet Handling
# -----------------------------------------------------------------------------
@ -51,12 +45,7 @@ def snippet_new(request, template_name='dpaste/snippet_new.html'):
'lexer_list': LEXER_LIST,
'is_new': True,
}
return render_to_response(
template_name,
template_context,
RequestContext(request, template_globals)
)
return render(request, template_name, template_context)
def snippet_details(request, snippet_id, template_name='dpaste/snippet_details.html', is_raw=False):
@ -108,11 +97,7 @@ def snippet_details(request, snippet_id, template_name='dpaste/snippet_details.h
'gist': getattr(settings, 'DPASTE_ENABLE_GIST', True),
}
response = render_to_response(
template_name,
template_context,
RequestContext(request, template_globals)
)
response = render(request, template_name, template_context)
if is_raw:
response['Content-Type'] = 'text/plain;charset=UTF-8'
@ -158,11 +143,7 @@ def snippet_history(request, template_name='dpaste/snippet_list.html'):
'snippet_list': snippet_list,
}
return render_to_response(
template_name,
template_context,
RequestContext(request, template_globals)
)
return render(request, template_name, template_context)
def snippet_diff(request, template_name='dpaste/snippet_diff.html'):
@ -205,11 +186,7 @@ def snippet_diff(request, template_name='dpaste/snippet_diff.html'):
'fileB': fileB,
}
return render_to_response(
template_name,
template_context,
RequestContext(request, template_globals)
)
return render(request, template_name, template_context)
def snippet_gist(request, snippet_id): # pragma: no cover
@ -258,11 +235,7 @@ def about(request, template_name='dpaste/about.html'):
count=Count('lexer')).order_by('-count')[:5],
}
return render_to_response(
template_name,
template_context,
RequestContext(request, template_globals)
)
return render(request, template_name, template_context)
# -----------------------------------------------------------------------------