Browse Source

Optimisation sur le menu d'edition d'une machine (accèlère)

Conflicts:
	machines/views.py
infra2.0
Gabriel Detraz 9 years ago
committed by root
parent
commit
f7e347f1ef
  1. 3
      machines/forms.py
  2. 2
      machines/views.py

3
machines/forms.py

@ -26,6 +26,8 @@ from .models import Domain, Machine, Interface, IpList, MachineType, Extension,
from django.db.models import Q
from django.core.validators import validate_email
from users.models import User
class EditMachineForm(ModelForm):
class Meta:
model = Machine
@ -53,6 +55,7 @@ class EditInterfaceForm(ModelForm):
self.fields['mac_address'].label = 'Adresse mac'
self.fields['type'].label = 'Type de machine'
self.fields['type'].empty_label = "Séléctionner un type de machine"
self.fields['machine'].queryset = Machine.objects.all().select_related('user')
def clean(self):
data = super(EditInterfaceForm, self).clean()

2
machines/views.py

@ -751,7 +751,7 @@ def mac_ip_list(request):
@login_required
@permission_required('serveur')
def alias(request):
alias = Domain.objects.filter(interface_parent=None).filter(cname__in=Domain.objects.filter(interface_parent__in=Interface.objects.exclude(ipv4=None)))
alias = Domain.objects.filter(interface_parent=None).filter(cname=Domain.objects.filter(interface_parent__in=Interface.objects.exclude(ipv4=None))).select_related('extension')
seria = DomainSerializer(alias, many=True)
return JSONResponse(seria.data)

Loading…
Cancel
Save