Commit 5de557de authored by root's avatar root
Browse files

Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o

Conflicts:
	machines/views.py
parents 39f3994e 8df5e7fb
......@@ -609,7 +609,7 @@ def del_alias(request, interfaceid):
@login_required
@permission_required('cableur')
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').prefetch_related('interface_set__domain__related_domain').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').order_by('pk')
paginator = Paginator(machines_list, PAGINATION_LARGE_NUMBER)
page = request.GET.get('page')
try:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment