rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-23 11:53:12 +00:00
Code Issues Releases Wiki Activity

Merge conflict

Browse source
This commit is contained in:
Gabriel Detraz 2017-05-27 23:43:18 +00:00 committed by Mael Kervella
parent a8442fd081
commit fa28d9754c
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
machines/views.py
View file

@ -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