From 8573e2b8d1ff4a9a675efcf2a36dc22f5bb63f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Tue, 5 Jun 2018 18:50:22 +0000 Subject: [PATCH] Fix #130: Check the right value for need_infra filtering --- machines/forms.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/machines/forms.py b/machines/forms.py index a838719f..91df33d4 100644 --- a/machines/forms.py +++ b/machines/forms.py @@ -99,7 +99,8 @@ class EditInterfaceForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): self.fields['ipv4'].queryset = IpList.objects.filter( interface__isnull=True ) - if not IpType.can_use_all(user): + can_use_all_iptype, _reason = IpType.can_use_all(user) + if not can_use_all_iptype: self.fields['ipv4'].queryset = IpList.objects.filter( interface__isnull=True ).filter(ip_type__in=IpType.objects.filter(need_infra=False)) @@ -114,7 +115,8 @@ class EditInterfaceForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): if "machine" in self.fields: self.fields['machine'].queryset = Machine.objects.all()\ .select_related('user') - if not MachineType.can_use_all(user): + can_use_all_machinetype, _reason = MachineType.can_use_all(user) + if not can_use_all_machinetype: self.fields['type'].queryset = MachineType.objects.filter( ip_type__in=IpType.objects.filter(need_infra=False) )