Browse Source

Optimisations select_related

infra2.0
Gabriel Detraz 9 years ago
committed by root
parent
commit
cf3bbda5fd
  1. 8
      machines/views.py
  2. 2
      users/models.py
  3. 4
      users/views.py

8
machines/views.py

@ -625,21 +625,21 @@ def index(request):
@login_required
@permission_required('cableur')
def index_iptype(request):
iptype_list = IpType.objects.order_by('type')
iptype_list = IpType.objects.select_related('extension').order_by('type')
return render(request, 'machines/index_iptype.html', {'iptype_list':iptype_list})
@login_required
@permission_required('cableur')
def index_machinetype(request):
machinetype_list = MachineType.objects.order_by('type')
machinetype_list = MachineType.objects.select_related('ip_type').order_by('type')
return render(request, 'machines/index_machinetype.html', {'machinetype_list':machinetype_list})
@login_required
@permission_required('cableur')
def index_extension(request):
extension_list = Extension.objects.order_by('name')
mx_list = Mx.objects.order_by('zone')
ns_list = Ns.objects.order_by('zone')
mx_list = Mx.objects.order_by('zone').select_related('zone')
ns_list = Ns.objects.order_by('zone').select_related('zone')
return render(request, 'machines/index_extension.html', {'extension_list':extension_list, 'mx_list': mx_list, 'ns_list': ns_list})
@login_required

2
users/models.py

@ -696,7 +696,7 @@ class NewListRightForm(ListRightForm):
self.fields['gid'].label = 'Gid, attention, cet attribut ne doit pas être modifié après création'
class DelListRightForm(ModelForm):
listrights = forms.ModelMultipleChoiceField(queryset=ListRight.objects.all(), label="Droits actuels", widget=forms.CheckboxSelectMultiple)
listrights = forms.ModelMultipleChoiceField(queryset=ListRight.objects.all().select_related('user'), label="Droits actuels", widget=forms.CheckboxSelectMultiple)
class Meta:
exclude = ['listright','gid']

4
users/views.py

@ -496,7 +496,7 @@ def index(request):
@permission_required('cableur')
def index_ban(request):
""" Affiche l'ensemble des ban, need droit cableur """
ban_list = Ban.objects.order_by('date_start').reverse()
ban_list = Ban.objects.order_by('date_start').select_related('user').reverse()
paginator = Paginator(ban_list, PAGINATION_NUMBER)
page = request.GET.get('page')
try:
@ -513,7 +513,7 @@ def index_ban(request):
@permission_required('cableur')
def index_white(request):
""" Affiche l'ensemble des whitelist, need droit cableur """
white_list = Whitelist.objects.order_by('date_start')
white_list = Whitelist.objects.select_related('user').order_by('date_start')
return render(
request,
'users/index_whitelist.html',

Loading…
Cancel
Save