rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Fix_130' into 'master'

Browse source 
Fix #130: Check the right value for need_infra filtering

Closes #130

See merge request federez/re2o!171
This commit is contained in:
moamoak 2018-06-18 14:04:35 +02:00
commit 839d88a0c4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
machines/forms.py
View file

@ -99,7 +99,8 @@ class EditInterfaceForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
self.fields['ipv4'].queryset = IpList.objects.filter( self.fields['ipv4'].queryset = IpList.objects.filter(
interface__isnull=True 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( self.fields['ipv4'].queryset = IpList.objects.filter(
interface__isnull=True interface__isnull=True
).filter(ip_type__in=IpType.objects.filter(need_infra=False)) ).filter(ip_type__in=IpType.objects.filter(need_infra=False))
@ -114,7 +115,8 @@ class EditInterfaceForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
if "machine" in self.fields: if "machine" in self.fields:
self.fields['machine'].queryset = Machine.objects.all()\ self.fields['machine'].queryset = Machine.objects.all()\
.select_related('user') .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( self.fields['type'].queryset = MachineType.objects.filter(
ip_type__in=IpType.objects.filter(need_infra=False) ip_type__in=IpType.objects.filter(need_infra=False)
) )