mirror of
https://github.com/postgres/pgweb.git
synced 2025-08-06 09:57:57 +00:00
Replace NavContext and render_to_response with render_pgweb
render_to_response does not work on newer django, so it needs to be replaced. And using a speicfic context actually overcomplicates things, it's easier to just use a wrapper function. For those cases where we don't need NavContext, just use render() (the new shortcut function from django), which also removes the need to use RequestContext.
This commit is contained in:
@ -1,8 +1,7 @@
|
||||
from django.shortcuts import render_to_response
|
||||
from django.http import Http404
|
||||
from pgweb.util.decorators import login_required
|
||||
|
||||
from pgweb.util.contexts import NavContext
|
||||
from pgweb.util.contexts import render_pgweb
|
||||
from pgweb.util.helpers import simple_form
|
||||
|
||||
from models import ProfessionalService
|
||||
@ -21,12 +20,12 @@ def root(request, servtype):
|
||||
title = servtype=='support' and 'Professional Services' or 'Hosting Providers'
|
||||
what = servtype=='support' and 'support' or 'hosting'
|
||||
support = servtype=='support'
|
||||
return render_to_response('profserv/root.html', {
|
||||
return render_pgweb(request, 'support', 'profserv/root.html', {
|
||||
'title': title,
|
||||
'support': support,
|
||||
'regions': regions,
|
||||
'what': what,
|
||||
}, NavContext(request, 'support'))
|
||||
})
|
||||
|
||||
|
||||
def region(request, servtype, regionname):
|
||||
@ -44,14 +43,14 @@ def region(request, servtype, regionname):
|
||||
# Field names are cleaned up earlier, so it's safe against injections.
|
||||
services = ProfessionalService.objects.select_related('org').filter(approved=True).extra(where=["region_%s AND provides_%s" % (regionname, what),])
|
||||
|
||||
return render_to_response('profserv/list.html', {
|
||||
return render_pgweb(request, 'support', 'profserv/list.html', {
|
||||
'title': title,
|
||||
'support': support,
|
||||
'what': what,
|
||||
'whatname': whatname,
|
||||
'regionname': regname,
|
||||
'services': services,
|
||||
}, NavContext(request, 'support'))
|
||||
})
|
||||
|
||||
|
||||
# Forms to edit
|
||||
|
Reference in New Issue
Block a user