mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-25 22:22:26 +00:00
Select_related et accélération des vues rest
Conflicts: machines/views.py
This commit is contained in:
parent
6a85468a0a
commit
a8442fd081
2 changed files with 8 additions and 2 deletions
|
@ -68,7 +68,7 @@ def form(ctx, template, request):
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('cableur')
|
@permission_required('cableur')
|
||||||
def index(request):
|
def index(request):
|
||||||
revisions = Revision.objects.all().order_by('date_created').reverse()
|
revisions = Revision.objects.all().order_by('date_created').reverse().select_related('user').prefetch_related('version_set__object')
|
||||||
paginator = Paginator(revisions, PAGINATION_NUMBER)
|
paginator = Paginator(revisions, PAGINATION_NUMBER)
|
||||||
page = request.GET.get('page')
|
page = request.GET.get('page')
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -609,7 +609,7 @@ def del_alias(request, interfaceid):
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('cableur')
|
@permission_required('cableur')
|
||||||
def index(request):
|
def index(request):
|
||||||
machines_list = Machine.objects.select_related('user').prefetch_related('interface_set__domain__extension').prefetch_related('interface_set__ipv4__ip_type__extension').prefetch_related('interface_set__type').order_by('pk')
|
machines_list = Machine.objects.select_related('user').prefetch_related('interface_set__domain__extension').prefetch_related('interface_set__ipv4__ip_type__extension').prefetch_related('interface_set__type').prefetch_related('interface_set__domain__related_domain').order_by('pk')
|
||||||
paginator = Paginator(machines_list, PAGINATION_LARGE_NUMBER)
|
paginator = Paginator(machines_list, PAGINATION_LARGE_NUMBER)
|
||||||
page = request.GET.get('page')
|
page = request.GET.get('page')
|
||||||
try:
|
try:
|
||||||
|
@ -637,9 +637,15 @@ def index_machinetype(request):
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('cableur')
|
@permission_required('cableur')
|
||||||
def index_extension(request):
|
def index_extension(request):
|
||||||
|
<<<<<<< HEAD
|
||||||
extension_list = Extension.objects.order_by('name')
|
extension_list = Extension.objects.order_by('name')
|
||||||
mx_list = Mx.objects.order_by('zone')
|
mx_list = Mx.objects.order_by('zone')
|
||||||
ns_list = Ns.objects.order_by('zone')
|
ns_list = Ns.objects.order_by('zone')
|
||||||
|
=======
|
||||||
|
extension_list = Extension.objects.select_related('origin').order_by('name')
|
||||||
|
mx_list = Mx.objects.order_by('zone').select_related('zone').select_related('name__extension')
|
||||||
|
ns_list = Ns.objects.order_by('zone').select_related('zone').select_related('ns__extension')
|
||||||
|
>>>>>>> 39f3994... Select_related et accélération des vues rest
|
||||||
return render(request, 'machines/index_extension.html', {'extension_list':extension_list, 'mx_list': mx_list, 'ns_list': ns_list})
|
return render(request, 'machines/index_extension.html', {'extension_list':extension_list, 'mx_list': mx_list, 'ns_list': ns_list})
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
|
|
Loading…
Reference in a new issue