From c0b2fe1708d06f6959d9732ee81a6cdf25b9cb63 Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Sat, 27 May 2017 23:43:18 +0000 Subject: [PATCH] Merge conflict --- machines/views.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/machines/views.py b/machines/views.py index d3f70dbe..08a9545d 100644 --- a/machines/views.py +++ b/machines/views.py @@ -637,15 +637,9 @@ def index_machinetype(request): @login_required @permission_required('cableur') def index_extension(request): -<<<<<<< HEAD - extension_list = Extension.objects.order_by('name') - mx_list = Mx.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}) @login_required